Merge "Fixed NoneType issue when monitoring-environment.yaml"