Update native with fix for #5832