PR #6988

PR #6988 is not in the merge queue.