Import server changes from test_full branch

Import server changes from test_full branch