Merge branch 'f.dist' into d
add xpt#priority