PR #2507

PR #2507 is not in the merge queue.