Merge "SF multithreaded_present: clean up and add more tests" into main