Bug #24283
Merge pull request #8 from mekhanikov/develop

Bug #24283