Merge "Read env vars instead of using CONST in API"