Pre-release 11.1.1alpha tested
Merge pull request #168 from Bohdan-Tereta/development

Issue #159 reverted
Pre-release 11.1.1alpha tested, issues #137, #155, #157, #165 fixed,