Merge "Remove test for QS and QQS constraints" into tm-qpr-dev