Merge pull request #2406 from vkargov/master