Merge branch 'intern_native_arg'