[TO_STAGE] Bug 1039760: patch env var api stage