port af_ib_addr from master to v1.8