Upgrade from 1.9.7 to latest