Merge from SS/JET