CDK-575: More updates due to CDK-140.