Server hookup test mode
Merge branch 'master' of https://github.com/sukhada/15239
Server hookup