Merge branch 'bug124-CloakHostModeX'