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