Sync with server snapshot + Fix for issue 31