Merge "Switch to new ofplugin"