Merge "Splits without restart" into nyc-dev