PR #2625

PR #2625 is not in the merge queue.