Issue #540 completed. Bug in issue #538 fixed.
Merge pull request #548 from nazariitashak/development

Issue #540 completed. Bug in issue #538 fixed.