Merge pull request #9002 from non-existent/branch