PR #6899

PR #6899 is not in the merge queue.