Merged changes for UNL2003