Merge "Unset the imageRef when booting from volume"