More efficient volume removal
Merge branch 'master' into image-name-flag
No need to remove the volumes