PR #6976

PR #6976 is not in the merge queue.