Merge branch 'jk/getwholeline-getdelim-empty'