PR #6974

PR #6974 is not in the merge queue.