PR #2787

PR #2787 is not in the merge queue.