update to previous change, to only set columnMetaData when columnName is
non null