mod: sync from upstream