STORAGEMODEL-288 fixing unpack_json