merge from develop.  

SWC-1405: fix null column value rendering and backfill unit tests