Merge "[Bugfix][T106BUG-347] Fix the *err not update"