More integration of multithreaded G4.
Merge pull request #1262 from ktf/enable-G4-multithreaded2

More integration of multithreaded G4.