PR #2631

PR #2631 is not in the merge queue.