Fix not allow to update user details in survey form
Fix conflicts after merging MH-568 to dev