Merge remote-tracking branch 'remotes/origin/main' into 733-public-api-enum-names