Merge pull request #4889 from huanghongbo-hhb/fix/helm-env-service-state