merge in latest 4.0