Merge branch 'main' into 1552-fix-for-crash-rtp-term