PR #6887

PR #6887 is not in the merge queue.