Merge "Make QS light" into oc-dev