Merge "Reapply "New test_module_config_entries for FrameworksCore"" into main