Merge pull request #3214 from rpv-tomsk/issue-3181