[core] fix typo & tiny correction
Merge branch '2.1' into 2.1_n