Merged v1.65 into pkts