Merge remote-tracking branch 'ms/frr' into next