TABDEV-1613. Don't include the subject in JSON if it is empty.
Merge branch 'TABDEV-1613' into develop