Merge "Change of ECS to ICS in test env"