Merge 3.0.4 in master