please merge. updates for latest Cuis.