Merge "RESTRICT AUTOMERGE" into rvc-qpr-dev