PR #2520

PR #2520 is not in the merge queue.