PR #2813

PR #2813 is not in the merge queue.