- moved clientAddr, clientRoot + clientIsLocal from internal to normal context