Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev