PR #6978

PR #6978 is not in the merge queue.