Merge "Fixes LP #992640 - Volumes sometimes not cleaned"