Found with -race. Improve locking on Server. Upstream-commit: abfdaca3f86d7951693697fbd849078d6b406478 Component: engine