Retain volume ownership and permissions Upstream-commit: 3fb08708788816a62f062305cb9244c1b2077ed4 Component: engine