Merge pull request #5008 from eileenmcnaughton/rebase