Merge change I5ddc721d

* changes:
  Add misssing symbol type directives.