Support v1.60 APIs