Pulling over changes from 1.6