i058959 - for master branch of new plugins