Close 0.6 branch