Lp 1801998: Deprecate Hatch Storage Grammar Fix