Issue #567 completed
Issue #568 fixed.
Merge pull request #569 from nazariitashak/development

Issue #567, #568 completed