Merge "Improvements on the return value of ECS rest api"