[33/40] Porting call number splitting improvements from HEAD