PR #6903

PR #6903 is not in the merge queue.