Merge "Avoid runtime restart when storage is missing." into nyc-dev