Merge from jose