[ci skip] Manually apply #2162, #2163
2 files changed