1.7 buildscript changes