Merge "SF: use FenceTime when possible" into sc-dev