Merging changes (CIMBA 1.1) from Alex/Happy/Will.