Updated standalone client