Add option for disable resync in client mode