PR #6910

PR #6910 is not in the merge queue.