Issue 18394: Manually merged changes from pull request in other repo