Merge "SF: Add FenceTracker" into nyc-dev