Merge "Fix crash in plugin settings" into oc-dev