Merge "Fix SurveyMixinTest" into main