IA-786 #comment Some improvements on local address registration for slaves in master node