Merge pull request #2341 from rpv-tomsk/issue-2328