Merge branch 'jk/add-empty' into ei/oneline+add-empty