Issue #3414505 by jonathan1055, fjgarlin, cmlara, FeyP, Berdir: Allow all sub-modules to be compatible with next_major