PR #2594

PR #2594 is not in the merge queue.