Merge "Use the "fast track" storage calculation for all categories."