Merge changes I36d1e494,I65a74ac6 into main

* changes:
  Add missing supportedEnumValues
  Add missing status codes