Starting release 1.7; rev develop branch to 1.8