Merge branch '841-mc-rs-hrft-handle-not-set-to-null' into 'main'

[Non-BE] Resolve "MC RS HRFT handle not set to NULL"

See merge request !1131