Merge "Track volume cleanup"