PR #2633

PR #2633 is not in the merge queue.