PR #6905

PR #6905 is not in the merge queue.