Start work on #3243