PR #2447

PR #2447 is not in the merge queue.