PR #2632

PR #2632 is not in the merge queue.