PR #2635

PR #2635 is not in the merge queue.