Dev/issues #7289 #7290 #7292 (MODS import etc)

Slightly cleaned up version of our integration branch for MODS improvements.