Polish changes from PR #2830
4 files changed