Merge remote-tracking branch 'upstream/main' into dev-update-from-main