Merge pull request #9773 from 805447391/master