BAP-6590: Base Client Side Architecture

// code that