Merge changes from topic "nfc_api_feedback" into main

* changes:
  nfc(api): Address API council feedback
  nfc(api): Address API council feedback