Merge "Performance regression when hot reloading"