Fix #431. Empty Text cell shouldn't be hidden.
Fix flexible fix for #431
Merge branch 'master' into perf