Persistent storage stomp 7

Merged Jean-Didier Totow requested to merge persistent-storage-stomp-7 into morphemic-rc1.5

Merge request reports