Release 2.6.1

Merge branch 'develop'
Fix for cdk 1.5.x