Merges from private branch -- improved module loading