Revert "Revert "STORAGEMODEL-246""

This reverts commit 8c90ea5097dc800da9fbb0f61954e95b1ac0befc.