Merge "QS visual updates for P"