PR #6906

PR #6906 is not in the merge queue.