Merge remote-tracking branch 'upstream/main' into jpnurmi/build/cocoa-submodule

Author: jpnurmi