Line numbers are slightly off, because this was after merging it locally with current master.