Merge branch 'fix_copying_ext_lib' into both_fixes