fix typo and cherry-pick