Merge remote-tracking branch 'remotes/origin/main' into 841-mc-rs-hrft-handle-not-set-to-null