Merge pull request #1997 from rpv-tomsk/issue-1995