Merge nevir updates.