Merge pull request #2684 from rpv-tomsk/fix-2673