PR #2508

PR #2508 is not in the merge queue.