Merge pull request #9947 from davidjosephhayes/master