Merge pull request #7972 from cpuguy83/split_volumes_from_daemon

Split volumes out from daemon