allow all external
Merge branch 'master' into jarv/test-2