Commit of server client improvements - 8.24