bump 3.17.7
Merge branch '3.18'