sync with 1.9.18 branch (clean up comments)