PR #6937

PR #6937 is not in the merge queue.