Auto-Merge pull request #2507 from rpv-tomsk/issue-2506