PR #6939

PR #6939 is not in the merge queue.