[ci skip] Fix #3919, #4732
2 files changed