Merge pull request #6305 from joannechester/patch-3