Added Tom's changes for CDK-167