Rebuild server, add key types
clear code, Rebuild server
rebuild server, add key type
Merge remote-tracking branch 'origin/master'