Add TODO for when we branch for 4.0