PR #6995

PR #6995 is not in the merge queue.