Merge from purcell into mine