[DO NOT MERGE] Recalc tracked storage