[TASK] Sync last changes between catharsis and current upstream master