Merge "Disable W+ in QS." into sc-dev