Merge pull request #19736 from champtar/phantap-lacp