Merging storage client 2.0.6.1 to master

Merging storage client 2.0.6.1 to master per @sozler