Merge in 1.9 changes

Merging in changes from 1.9