Changes from 2.0 branch