Merge remote-tracking branch 'remotes/origin/main' into 851-api-public-constants-review