Updates from 2.x