fixes for plugin integration
Merge remote-tracking branch 'upstream/master'