Merge remote-tracking branch 'upstream/main' into rory/lint-examples