case 2942 - Represent empty data rows with zero.
Merge branch 'case-2942' into develop