[DEP-89] Review is done