initial support for legacy server
Merge branch 'origin/master'