Merge "Revert "Fix reclass.storage for SL2""