merging in 3.9