Merge branch 'no_build_script'