Merge pull request #2357 from rpv-tomsk/issue-2305