Start work on #9560