Add 23197 as punted in 3.8
Ticket management, reordering