Merge change I47b9b7f9

* changes:
  DPQ Comment cleanup (and a few very minor code changes)