Merge remote-tracking branch 'remotes/origin/main' into 484-jitter-leftovers