Minor debug
Minor changes
Solve merging confict on xpadConfiguration
Correct merging problem
Minor debug