Merge "Various QS fixes and cleanup"