Fixed in -server.
Merge heads