Merge pull request #5014 from eileenmcnaughton/rebase