merge from xe3