PR #2626

PR #2626 is not in the merge queue.