Merge "[Bugfix][API-838]fix userdata usage is 100% 2" into GSW3.0