merge 1.7