PMO-2819: adjusted to work with newest core plugin
Merge remote-tracking branch 'origin/master'