Merge branch 'plugin-move-opus'