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