Merge "Prototype less rows in QS"