Merge branch 'prevent-public-answers' into 'develop'