Merge changes Ide7d63a7,I9e075f29 into tm-qpr-dev

* changes:
  Format files with the upcoming version of ktfmt
  Regenerate include file for ktfmt upgrade