Merge "Add class for remote_collector in container"