Merge pull request #530 from Bohdan-Tereta/development

Issue #487 fixed
Merge remote-tracking branch 'upstream/development' into development