Merged kdfdocs/master into kd/master.docs