Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev