Commit Pre XPT v4 merge