Polish changes from PR #2712
4 files changed