Added up through 6.2.3, sans tests.