update for 1.7
merge 1.6