Merge branch 'dl/no-extern-in-func-decl'