- partial 24.0 update