Merge "RESTRICT AUTOMERGE Add code to check for SELECT statements in query" into qt-qpr1-dev