Merge branch 'object-show' into dt-test
Merge branch 'test-clientmanager' into dt-test