Merge changes from topic "master" into integration

* changes:
  fix(tc): rename macro to match PSA spec
  fix(tc): Correct return type