Merge "Parallel module loading: Fix typo and simplify logic" into main