Merge pull request #435 from shaitan/master

Applied fixes from lts branch
v2.25.4.4