Merge 'fix-externals' into HEAD