added a missing function
Merge branch 'test-server' into integration