Merge branch 'develop' into feature/FLEX-35328_simplify_mdl_drop_down_list