Issue #487 fixed
Merge remote-tracking branch 'upstream/development' into development
Issue #488 fixed
Merge pull request #492 from Bohdan-Tereta/development

Issues #487, #488 fixed