Merge "More correct startup and shutdown procedures." into nyc-mr2-dev