removed throwing a type error for using static and extern modifiers at the same time.
Merge remote-tracking branch 'origin/defusecleanup' into defusecleanup