Optimization of findModule
Merge remote-tracking branch 'upstream/pu' into pu
findModule improved, did not work as earlier version