+ volume manager polishing
Merge origin/master