Issue #423 fixed
Merge remote-tracking branch 'upstream/development' into development
Issue 455 fixed
Merge pull request #460 from Bohdan-Tereta/development

Issue #423 fixed