[#875179] Review changes.