Merge "Limit the translation code on NAT-T keepalive" into main