4.0.7 merge