Merge pull request #2362 from rpv-tomsk/issue-2338