[ci skip] Polish changes from #2874
3 files changed