prettier toString()s
JIRA-1980 add data validation
Merge remote-tracking branch 'origin/master'
remove TODO