Merge change 9693

* changes:
  add missing types