Issue #593 fixed
Issue #593.1 fixed
Merge pull request #594 from Bohdan-Tereta/development

Issue #593, #592.1 fixed