Merge remote-tracking branch 'remotes/origin/main' into Revision_of_common_api_types