Merge "Fix test-suite for test_module_configs" into main