Added safety to local build script
Script fix
Another Script fix
Merge branch 'dev' into ms