Further changes related to PR #2807