Merge "RESTRICT AUTOMERGE" into pi-dev