Merge "Add sync to avoid the loss of pub key data"