Depends on #9677