Merge pull request #4118 from kurarrr/feat/multi-select-survey-vars