Merge pull request #17515 from seamuslee001/replace_legacy_rebuild_module_data