Merge "3 column QS" into sc-v2-dev