PR #6987

PR #6987 is not in the merge queue.