finish 24.3 merge