Update for 24.4