For Apigee Upgrade