CDK-656: Updates based on testing from the host machine.