Merge pull request #1799 from intersvyaz/v3.0.x-patch2