test commit
clean commiting HostDetect
cleaning conflicts
Merge branch 'HostDetectClean'