sync with latest Mk
evo server: regen diff