Backport Module-CoreList changes for v5.19.7 for sanity