[CAST-1983] Easy part of review completed