Fixes 6.7 merge issue, and non-returning on external.c