PR #2518

PR #2518 is not in the merge queue.