Branch created to be in sync with cdmlib snapshot