PR #2823

PR #2823 is not in the merge queue.