Bulk update to align with the spec
- CDI-348
- CDI-319
- CDI-360
- CDI-361
- CDI-357
- CDI-356