fix bug 1143123 - failed to get ip after FT
fix merge error