For #26168 - Fix for apply_fields when template represents storage root