[ELF-28] migrate to upstream 1.18