Merge "Prototype remove labels in QS"