Bring patch 210 in line with schema.
Merge branch 'dev' into dev-db
Fixing patch 210 to avoid truncating data.