Merge "Change of ECS to ICS in docker env etc."