PR #6863

PR #6863 is not in the merge queue.