[TASK] Sychronize catharsis with upstream master