Merge branch 'fix_genexternal.py_syntax'