Ports the branch to post-thread-safe-sourceFiles