Apply patch from RT #82012
Merge pull request #1 from sergeyromanov/master

Patch from RT #82012 is applied