Merge pull request #6900 from chanunc/4.6