Sw az review haisheng suggestions and implement changes if necessary #7

Closed stevenwong-okta closed 3 years ago