Merge pull request #528 from Bohdan-Tereta/development

Issue #527 fixed
Issue #500 completed.
Merge pull request #529 from nazariitashak/development

Issue #500 completed.
Merge remote-tracking branch 'upstream/development' into development