Merge "Updating host volume directory"