Merge branch 'jk/getwholeline-getdelim-empty' into maint