PR #6920

PR #6920 is not in the merge queue.