[TASK] Synchronise catharsis with upstream master