Auto-Merge pull request #3228 from rpv-tomsk/issue-3215