CM - 5.1

Partial checkin for this section.