[CAST-1987] Review (first iteration)