Change die to warn
Restore to version be0403
Merge branch 'master' into reorder_cols
Remove warning