add skip support and server default compare
fix 2.6 bug