Merge pull request #6296 from jjm2473/patch-2