Issue #518 fixed
Merge remote-tracking branch 'upstream/development' into development
Merge pull request #531 from Bohdan-Tereta/development

Issue #518 fixed