Just as a note, we can start dropping this "2.x" notes