PR #6975

PR #6975 is not in the merge queue.