Merge 1.5.0.7 in