upgrade from 1.7.9