take_survey_params fixed
Merge branch 'master' into take_survey_params