BAP-6590: Base Client Side Architecture

memory leak issues. The rest of components,