merge with 1.7 version