PR #2805

PR #2805 is not in the merge queue.