Ng user storage.mlhr 1341

Fixes MLHR-1341