Changes from client integration translated here for continued
development