Merge "[Bugfix][API-584]reduce ubi problem" into MR3.0