[TASK] Sync catharsis with upstream