Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'