mod_base: merge from release