Merge "Create a new test_module_config entries for TEST_MAPPING options" into main