* fix #18410 * one line comment * typo * typo * cover cpp (cherry picked from commit 2f730afe9e)
2f730afe9e