Merge "Update temp-service-list"