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