Merge pull request #571 from Bohdan-Tereta/development

Issues #562 and #570 fixed
Issue #572 fixed
Merge remote-tracking branch 'upstream/development' into development