[CAST-1983] Review finished