Merge "Bug in interface delete 400G-Ethernet" into stable/phosphorus