Merge uh-joan changes