PR #2509

PR #2509 is not in the merge queue.