Merge "RESTRICT AUTOMERGE Protect against possible race conditions" into nyc-dev