LP#1801998 Deprecate Hatch for data storage