CSIT-1110: Replace old trending with the new one