Merge pull request #542 from EricpolUkraine/test

Release merge v1.15.5.0
Merge pull request #546 from EricpolUkraine/master

Merge pull request from master to test