Follow-up from "Override module to specify that we're overriding"

The following discussion from !3876 (merged) should be addressed:

• @godfat started a discussion:

  We should probably try to combine all the tasks into one? Could save some loading time