Merge pull request #4906 from eileenmcnaughton/minor-tidies