fix module config
Merge remote branch 'upstream/master'
Finallized SurfCheckDefaulSP