1.7 update merged into master