Merge pull request #3217 from rpv-tomsk/issue-3215