Test conf Ver1 Part 1/2
Test conf Ver1.1 Part 1/2
Patch cleanup