PR #6894

PR #6894 is not in the merge queue.