MPS-18872 Classes fail to load from a generator module after MPS build is updated

More common class loading bug than that
Merge remote-tracking branch 'origin/MPS3.0' into 3.0/class_loading_bug
Merge remote-tracking branch 'origin/master' into 3.1/merge_mps3.0