PR #6954

PR #6954 is not in the merge queue.