Merge remote-tracking branch 'remotes/origin/main' into 834-rs-number-of-existing-channels-on-the-heap-mem-wrong