PR #6909

PR #6909 is not in the merge queue.