Merge branch 'feature/1584-client-captcha-options' into 'develop'