CDK-733: more doc enhancements