PR #2451

PR #2451 is not in the merge queue.