merge dependency on editor fix, regen s4ext