[zh-cn] Sync with 422d5c9c4fc6ba76190adb960de75dbe52c382ad and fa845bf
[zh-cn] Leftover from 520360d5dfff168073957be5b50b1c8f48f9e8b5