Merge branch 'loader-external-packages'