Control.Text with numeric value of 0 rendered empty
Merge remote-tracking branch 'upstream/develop' into develop