Merge "Update LinkProperties treatment of gateways"