Merge "RESTRICT AUTOMERGE Modernize alternate bouncer logic" into tm-qpr-dev