Merge pull request #4839 from hvr/pr/resolv