[CAST-1987] Review: third iteration