Add storage utility class
Merge branch 'release/2.3.0'