Merge pull request #2005 from rpv-tomsk/issue-1996