first commit for 0.4 tip