Merge changes from onearth