Merge branch 'jh/filter-empty-contents' into maint