PR #6973

PR #6973 is not in the merge queue.