Merge "Fix dtend synced up to server"