to 3.0.4 from master itself