merge to 1.7 branch