Changes from 1.7