PR #6958

PR #6958 is not in the merge queue.