Added up through 6.2.5, sans tests.