Merge db-sync to the v1.60