Bug #24251
Merge pull request #6 from mekhanikov/develop

Bug #24251