PR #6908

PR #6908 is not in the merge queue.