Merged update from ucldc.