PR #6840

PR #6840 is not in the merge queue.