Merge "Controls - Continue migration to QS" into sc-dev