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