Merge branch 'ta/config-add-to-empty-or-true-fix' into maint