Merge "[Feature][API-860][Data]Try to fix Data 8004 problem" into GSW3.0