Cleaned up SetDefaultColumnValues and fixed issues
Merge remote-tracking branch 'contributor/setdefaultcolumnvaluescleanup' into pr195