Revert "#FEC-636 #comment improvments for KDP Api"

This reverts commit 8796c4224072d360bdf5e4baee5afb660016dc36.
Revert "Revert "#FEC-636 #comment improvments for KDP Api""

This reverts commit b7827b75b553c577248e2d0a707c9ba76c1ba3e4.