Merge branch 'cdk-139' into master

This includes changes that address CDK-123 and implement CDK-161.