Merge branch 'master' into server_no_deadlock