[client][managed] merge refactoring changes from offline to dev
Merge pull request #354 from hasankhan/utilitydev

[client][managed] merge refactoring changes from offline to dev