Copying/merging persistent set/map from master.
Working on fix where sharingEnabled + redundancyProfilingEnabled is failing. Currently currently only running equals tracking when sharingEnabled is not enabled.