Merge "Support smart-sync through persistent-http[s]"