Merge pull request #5010 from eileenmcnaughton/rebase2