Re-work reviews [finishes #77066346]