Merge "Controls in QS" into sc-dev