PR #6983

PR #6983 is not in the merge queue.