Bug #24122
Merge pull request #7 from mekhanikov/develop

Bug #24122