Merge branch 'develop' into fix/csp-for-captcha