Merge branch 'fix/captcha' into 'develop'