Merge "Improvements to SF's BackgroundExcecutor." into main