Merge 4.0.7 into releases