PR #2510

PR #2510 is not in the merge queue.