PR #2606

PR #2606 is not in the merge queue.