Merge pull request #501 from Bohdan-Tereta/development

Issues #459 , #500, #502 fixed
Issue #499 fixed
Merge remote-tracking branch 'upstream/development' into development