Eng 5360

There is a pro request as well because of refactoring of client methods.