PR #6962

PR #6962 is not in the merge queue.