Merge pull request #2969 from rpv-tomsk/issue-2173