Merge 3.0.4.