[TASK] Sync core master and catharsis

Patch to sync some details of catharsis with core. Mostly no-brainers,
but also a patch for form that was forgotten to be fetched to
catharsis and a not yet merged feature in scheduler.