Merge "Implement new QQS/QS headers" into sc-dev