Merge branch 'test-clientmanager' into dt-test