PR #6897

PR #6897 is not in the merge queue.