CLOUDIFY-2392 storage phase 1