Merge "Add make sync target"