Add custom element labels for survey questions
Merge branch 'MH-981' into dev