[CAST-1983] Review: third iteration