Merge pull request #6295 from jjm2473/patch-1