update: 1.17 -> 1.18
Merge branch 'update-to-v1.8'