Merge pull request #9003 from non-existent/branch