fix warning, add cpp info on server start
Merge remote-tracking branch 'upstream/master' into lock