Fix #830: Better handling of follow/accept messages to avoid and recover from desync between instances