There are still a couple of modules that use their own lists, but that should not prevent this merge, those should be adapted to use this list in subsequent patch