Merge pull request #601 from Bohdan-Tereta/development

To issue #599
Merge pull request #602 from EricpolUkraine/test

Release merge v1.16.1.1 from 'test' to 'master'
Issue #605 fixed