Auto-Merge pull request #2611 from rpv-tomsk/fix-2587