Merge branch 'plugin-move-rtp-opus'