Fixed issue with the no-client setup switch
Merge branch 'setup_noclient'
Fixed significant no-client build issue