Bring public KDP branch up to development

This update:
o brings the KDP branch up to master
o brings the public KDP branch up to the development snapshot

It does not complete KDP development