PR #6818

PR #6818 is not in the merge queue.