Merge branch 'mh/for-each-string-list-item-empty-fix' into maint