add more tips and some comment
add more tips
Merge branch release-v1.9.6 into develop