Update native with workaround for #4078 and add some comments