PR #6892

PR #6892 is not in the merge queue.