1.8: many improvements to module load process