Merge from t4r0