PR #6991

PR #6991 is not in the merge queue.