Merged in changes from development repository.
Updated generated files.