PR #2612

PR #2612 is not in the merge queue.