Further changes related to PR #2807
3 files changed