Merge branch 't/server_optional'