Fix for trunk 212388+
Merge pull request #817 from Vsevolod-Livinskij/hotfix

Fix for trunk 212388