fix location of comment
Merge branch 'v1.8.x' into develop