Merged branches/cdmlib/2.0 changes r5130:5370 into the trunk