Merged in changes from development repository:

   Finished updating code for data types and database tables.
Updated generated files.