[4.25] Update