Adamed oc 9106 re merge

We merged this to 6-stable originally, but had to revert it because it contained plugin interface changes from master which were not intended for the incremental changes to 6-stable.