No need for setup to attempt to clean
Merge branch 'master' into 16
Update build-script for 1.6.2