merged v1.64-new-pkts