Merge branch 'es/configure-getdelim'