Merge pull request #603 from EricpolUkraine/master

Release merge v1.16.1.1 from 'master' to 'development'
Issue #605 fixed
Issues #604 and #605 fixed
Merge pull request #606 from Bohdan-Tereta/development

Issues #604 and #605 fixed
Merge pull request #607 from EricpolUkraine/development

Quick fix 1.16.1.2