Merge "Fix up the QS gutter" into oc-dev