Merge "codec2 plugin: misc fixes"