[CAST-1984] Review (first iteration)