Fix comment.
Fix conflicts, merge 4.0 branch.