[ci skip] Polish changes from PR #3278
2 files changed