Merge pull request #7514 from ping/patch-7301