Merge "RESTRICT AUTOMERGE Update String" into pi-dev