Build version update, port to 1.7 non-compile