Merge remote-tracking branch 'remotes/origin/main' into 37-contribution-jitter-fhg