Merge branch 'slava/plugin-incompatible-with'