Merge "[Bugfix][T106BUG-455]fix temp error"