PR #2619

PR #2619 is not in the merge queue.