Merge "Fixes for new QS"