Merge pull request #2834 from rpv-tomsk/plugin-context-master-2