Cleanup: initializeVolume Upstream-commit: 0c6b137f0602b619b3947e4c9737ccb363c91d96 Component: engine