Merge "Better scanning of secondary storage volumes."