diff --git a/.github/workflows/cloud.yml b/.github/workflows/cloud.yml
index c31898aef5..f89759d78a 100644
--- a/.github/workflows/cloud.yml
+++ b/.github/workflows/cloud.yml
@@ -71,7 +71,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
diff --git a/.github/workflows/drivers-tests.yml b/.github/workflows/drivers-tests.yml
index 6cacade498..1a329a94a9 100644
--- a/.github/workflows/drivers-tests.yml
+++ b/.github/workflows/drivers-tests.yml
@@ -104,7 +104,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index adab7c68d2..a7fd8342b7 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -55,7 +55,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml
index 7c401c171d..6dc6cdd39a 100644
--- a/.github/workflows/post-release.yml
+++ b/.github/workflows/post-release.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3c3d0e70a3..478970c906 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
@@ -95,7 +95,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
@@ -185,7 +185,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
@@ -260,7 +260,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
@@ -483,7 +483,7 @@ jobs:
             build-args: WITH_AVX2=1
             postfix: ""
             tag: "latest"
-          - os: self-hosted
+          - os: ubuntu-24.04-arm
             target: aarch64-unknown-linux-gnu
             platforms: linux/arm64
             build-args: WITH_AVX2=0
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index ecb81eecc0..bfe45fa6b1 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -54,8 +54,11 @@ jobs:
         # Current docker version + next LTS
         node-version: [20.x, 22.x]
         python-version: [3.11]
+        transpile-worker-threads: [false, true]
       fail-fast: false
 
+    env:
+      CUBEJS_TRANSPILATION_WORKER_THREADS: ${{ matrix.transpile-worker-threads }}
     steps:
       - id: get-tag-out
         run: echo "$OUT"
@@ -69,7 +72,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
@@ -149,7 +152,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
@@ -212,7 +215,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
@@ -334,7 +337,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
@@ -411,7 +414,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
@@ -638,7 +641,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
diff --git a/.github/workflows/rust-cubesql.yml b/.github/workflows/rust-cubesql.yml
index 74741e466a..c0308adfe3 100644
--- a/.github/workflows/rust-cubesql.yml
+++ b/.github/workflows/rust-cubesql.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt, clippy
@@ -138,7 +138,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
@@ -244,7 +244,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
@@ -327,7 +327,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-07-15
+          toolchain: 1.84.1
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
diff --git a/.github/workflows/rust-cubestore-master.yml b/.github/workflows/rust-cubestore-master.yml
index eb72e456f3..2421d9496a 100644
--- a/.github/workflows/rust-cubestore-master.yml
+++ b/.github/workflows/rust-cubestore-master.yml
@@ -84,12 +84,12 @@ jobs:
           - x86_64-unknown-linux-gnu
           - aarch64-unknown-linux-gnu
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             target: x86_64-unknown-linux-gnu
             platforms: linux/amd64
             build-args: WITH_AVX2=1
             postfix: ""
-          - os: self-hosted
+          - os: ubuntu-24.04-arm
             target: aarch64-unknown-linux-gnu
             platforms: linux/arm64
             build-args: WITH_AVX2=0
diff --git a/.github/workflows/rust-cubestore.yml b/.github/workflows/rust-cubestore.yml
index 05f443a705..44f929e8a4 100644
--- a/.github/workflows/rust-cubestore.yml
+++ b/.github/workflows/rust-cubestore.yml
@@ -81,11 +81,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             target: x86_64-unknown-linux-gnu
             platforms: linux/amd64
             build-args: WITH_AVX2=1
-          - os: self-hosted
+          - os: ubuntu-24.04-arm
             target: aarch64-unknown-linux-gnu
             platforms: linux/arm64
             build-args: WITH_AVX2=0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 869a1968d4..0f360ec0f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,153 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+### Features
+
+- **server-core:** add fastReloadEnabled option to CompilerApi ([#9289](https://github.com/cube-js/cube/issues/9289)) ([122a3a3](https://github.com/cube-js/cube/commit/122a3a30e526f122d2bf2c0661f2b32fa070e824))
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+### Bug Fixes
+
+- **cubesql:** Split `__user` WHERE predicate into separate filter node ([#8812](https://github.com/cube-js/cube/issues/8812)) ([83baf7b](https://github.com/cube-js/cube/commit/83baf7bf5f83108fd6c3dd134a8739968e781f92))
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+### Bug Fixes
+
+- **api-gateway:** data scope check ([#9264](https://github.com/cube-js/cube/issues/9264)) ([75095e1](https://github.com/cube-js/cube/commit/75095e1f86839a3f459d1050226b319d3ed2410f))
+- **cubesql:** Generate typed null literals ([#9238](https://github.com/cube-js/cube/issues/9238)) ([1dfa10d](https://github.com/cube-js/cube/commit/1dfa10d7128841f24c5d94cd1c5bdd2c742ff9de))
+- **cubesql:** Match CubeScan timestamp literal types to member types ([#9275](https://github.com/cube-js/cube/issues/9275)) ([4a4e82b](https://github.com/cube-js/cube/commit/4a4e82ba602fc024a262a22ac65e3fcb7a4bba5c))
+- **native:** Jinja - pass kwargs correctly into Python ([#9276](https://github.com/cube-js/cube/issues/9276)) ([9d1c3f8](https://github.com/cube-js/cube/commit/9d1c3f8cfef5fd9383ee5fa69e79328b5c739231))
+- **server-core:** Handle empty query in getSqlGenerator ([#9270](https://github.com/cube-js/cube/issues/9270)) ([350a438](https://github.com/cube-js/cube/commit/350a438d33d19ce77f33feb4f30910e3087d36e6))
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+### Bug Fixes
+
+- **cubesql:** Break cost symmetry for (non)-push-to-Cube WrappedSelect ([#9155](https://github.com/cube-js/cube/issues/9155)) ([2c0e443](https://github.com/cube-js/cube/commit/2c0e443dc18379490e35a3d83b3888f66e12ade0))
+- **cubesql:** Generate proper projection wrapper for duplicated members in CubeScanNode ([#9233](https://github.com/cube-js/cube/issues/9233)) ([aba6430](https://github.com/cube-js/cube/commit/aba643082acc440cf5b3fe9828c2c38ac1a833c9))
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+### Bug Fixes
+
+- **redshift-driver:** Fix empty tableColumnTypes for external (Spectrum) tables ([#9251](https://github.com/cube-js/cube/issues/9251)) ([fa318a1](https://github.com/cube-js/cube/commit/fa318a144ed6ef484e2ac101cd71ab6ab6ca7abf))
+- **schema-compiler:** Fix sql generation for rolling_window queries with multiple time dimensions ([#9124](https://github.com/cube-js/cube/issues/9124)) ([52a664e](https://github.com/cube-js/cube/commit/52a664e4d0643d78464f75cc48c4a1f686455ebe))
+
+### Features
+
+- **cubejs-server-core:** support proxy in http agent transport ([#9263](https://github.com/cube-js/cube/issues/9263)) ([89c74ce](https://github.com/cube-js/cube/commit/89c74cec2be96f63f51990b5eec59096749e967b))
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+### Bug Fixes
+
+- **schema-compiler:** Fix allowNonStrictDateRangeMatch pre-agg match for dateRange queries without granularities ([#9258](https://github.com/cube-js/cube/issues/9258)) ([00fe682](https://github.com/cube-js/cube/commit/00fe6825418e7ad6681b0856fee11175dfcc649e))
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+### Bug Fixes
+
+- **backend-native:** Handle closed channel on Rust side ([#9242](https://github.com/cube-js/cube/issues/9242)) ([1203291](https://github.com/cube-js/cube/commit/120329146046f2bffc0b8ff252dcee1cc285d1ef))
+
+### Features
+
+- **cubeclient:** Add `short_title` to dimensions and measures ([#9256](https://github.com/cube-js/cube/issues/9256)) ([584b3dc](https://github.com/cube-js/cube/commit/584b3dcefedb7c01b849e7f18a59445bd3542b7e))
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+### Bug Fixes
+
+- **schema-compiler:** hierarchies to respect prefix value ([#9239](https://github.com/cube-js/cube/issues/9239)) ([19d1b33](https://github.com/cube-js/cube/commit/19d1b33b7df6a98198aadfa25e290fd33b89ad33))
+
+### Reverts
+
+- **schema-compiler:** Revert breaking changes in models transpilation ([#9240](https://github.com/cube-js/cube/issues/9240)) ([28bca42](https://github.com/cube-js/cube/commit/28bca42a1bb92fff5895ddfe4946601c0ebc2746))
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+### Bug Fixes
+
+- **api-gateway:** Fix CompareDateRange queries native transformations ([#9232](https://github.com/cube-js/cube/issues/9232)) ([9c6153d](https://github.com/cube-js/cube/commit/9c6153d1e958e42162acb5af5964e9792a7f0433))
+- **schema-compiler:** Correct models transpilation in native in multitenant environments ([#9234](https://github.com/cube-js/cube/issues/9234)) ([84f90c0](https://github.com/cube-js/cube/commit/84f90c07ee3827e6f3652dd6c9fab0993ecc8150))
+
+### Features
+
+- **schema-compiler:** Boost models transpilation 10-13x times (using SWC instead of Babel) ([#9225](https://github.com/cube-js/cube/issues/9225)) ([2dd9a4a](https://github.com/cube-js/cube/commit/2dd9a4a5ba0f178e304befc476609fc30ada8975))
+
+### Performance Improvements
+
+- **cubesql:** Avoid allocations in MetaContext methods ([#9228](https://github.com/cube-js/cube/issues/9228)) ([ba753d0](https://github.com/cube-js/cube/commit/ba753d0d43927b50d5cf8faf5f09de3e53bec3db))
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+### Bug Fixes
+
+- **cubesql:** Fix SELECT DISTINCT on pushdown ([#9144](https://github.com/cube-js/cube/issues/9144)) ([6483f66](https://github.com/cube-js/cube/commit/6483f66c826ad9a638af8770850219d923b3e7d9))
+
+### Features
+
+- Upgrade rust to 1.84.1 (stable) ([#9222](https://github.com/cube-js/cube/issues/9222)) ([cfc95b5](https://github.com/cube-js/cube/commit/cfc95b5e5601166d2a0aa388a211d4be66630cd8))
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+### Bug Fixes
+
+- **cubejs-playground:** update query builder ([#9201](https://github.com/cube-js/cube/issues/9201)) ([f8e523b](https://github.com/cube-js/cube/commit/f8e523bbf815b2fb3fb8eb036d04cc3bf4db206d))
+
+### Features
+
+- **cubesql:** Add projection flattening rule ([#9165](https://github.com/cube-js/cube/issues/9165)) ([8cfb253](https://github.com/cube-js/cube/commit/8cfb2530264b856bf128d391829b18566d8dc057))
+- **cubesql:** Allow providing API type when getting load request meta ([#9202](https://github.com/cube-js/cube/issues/9202)) ([ae5d977](https://github.com/cube-js/cube/commit/ae5d9770a1c00326c446e7ec40bd3f13ca0ce8f4))
+- **server-core:** Introduce CUBEJS_REFRESH_WORKER_CONCURRENCY env and update default concurrency settings for drivers ([#9168](https://github.com/cube-js/cube/issues/9168)) ([7ef6282](https://github.com/cube-js/cube/commit/7ef628273905d47996b108862a52dde89b9525e3))
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+### Bug Fixes
+
+- **cubejs-backend-native:** support context_to_cube_store_router_id ([#9200](https://github.com/cube-js/cube/issues/9200)) ([f93edd3](https://github.com/cube-js/cube/commit/f93edd3713c58ad62ca8daee034639b0f10a0282))
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+### Bug Fixes
+
+- **dremio-driver:** Correct dremio date interval functions ([#9193](https://github.com/cube-js/cube/issues/9193)) ([7cf2287](https://github.com/cube-js/cube/commit/7cf2287e165beff948ddd88eb47bd0048812aa9b))
+- **schema-compiler:** Fix queries with time dimensions without granularities don't hit pre-aggregations with allow_non_strict_date_range_match=true ([#9102](https://github.com/cube-js/cube/issues/9102)) ([eff0736](https://github.com/cube-js/cube/commit/eff073629261c687416a92b8876e46a522bdd1d8))
+- **testing:** avoid cypress crashes ([#9196](https://github.com/cube-js/cube/issues/9196)) ([364d181](https://github.com/cube-js/cube/commit/364d1812d5b3aff85bfbfbb82f6d8d2217d8a4ab))
+
+### Features
+
+- **cubejs-server-core:** add contextToCubeStoreRouterId config option ([#9197](https://github.com/cube-js/cube/issues/9197)) ([6ee0e41](https://github.com/cube-js/cube/commit/6ee0e416761799acd064ad88241519ad2e1992f4))
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+### Features
+
+- **schema-compiler:** Move transpiling to worker threads (under the flag) ([#9188](https://github.com/cube-js/cube/issues/9188)) ([7451452](https://github.com/cube-js/cube/commit/745145283b42c891e0e063c4cad1e2102c71616a))
+- **tesseract:** Subqueries support ([#9108](https://github.com/cube-js/cube/issues/9108)) ([0dbf3bb](https://github.com/cube-js/cube/commit/0dbf3bb866b731f97b5588b0e620c3be7cbf9e5b))
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+### Bug Fixes
+
+- **@cubejs-client/ngx:** Update APF configuration and build settings for Angular 12+ compatibility ([#9152](https://github.com/cube-js/cube/issues/9152)) Thanks to @HaidarZ! ([57bcbc4](https://github.com/cube-js/cube/commit/57bcbc482002aaa025ba5eab8960ecc5784faa55))
+- **cubejs-playground:** update query builder ([#9175](https://github.com/cube-js/cube/issues/9175)) ([4e9ed0e](https://github.com/cube-js/cube/commit/4e9ed0eae46c4abb1b84e6423bbc94ad93da37c3))
+- **cubejs-playground:** update query builder ([#9184](https://github.com/cube-js/cube/issues/9184)) ([247ac0c](https://github.com/cube-js/cube/commit/247ac0c4028aef5295e88cd501323b94c5a4eaab))
+- **cubesql:** Avoid panics during filter rewrites ([#9166](https://github.com/cube-js/cube/issues/9166)) ([4c8de88](https://github.com/cube-js/cube/commit/4c8de882b3cc57e2b0c29c33ca4ee91377176e85))
+- **databricks-jdbc-driver:** Fix extract epoch from timestamp SQL Generation ([#9160](https://github.com/cube-js/cube/issues/9160)) ([9a73857](https://github.com/cube-js/cube/commit/9a73857b4abc5691b44b8a395176a565cdbf1b2a))
+- **schema-compiler:** make sure view members are resolvable in DAP ([#9059](https://github.com/cube-js/cube/issues/9059)) ([e7b992e](https://github.com/cube-js/cube/commit/e7b992effb6ef90883d059280270c92d903607d4))
+
+### Features
+
+- **cubeclient:** Add hierarchies to Cube meta ([#9180](https://github.com/cube-js/cube/issues/9180)) ([56dbf9e](https://github.com/cube-js/cube/commit/56dbf9edc8c257cd81f00ff119b12543652b76d0))
+- **cubesql:** Add filter flattening rule ([#9148](https://github.com/cube-js/cube/issues/9148)) ([92a4b8e](https://github.com/cube-js/cube/commit/92a4b8e0e65c05f2ca0a683387d3f4434c358fc6))
+- **cubesql:** Add separate ungrouped_scan flag to wrapper replacer context ([#9120](https://github.com/cube-js/cube/issues/9120)) ([50bdbe7](https://github.com/cube-js/cube/commit/50bdbe7f52f653680e32d26c96c41f10e459c341))
+- **snowflake-driver:** set QUOTED_IDENTIFIERS_IGNORE_CASE=FALSE by default ([#9172](https://github.com/cube-js/cube/issues/9172)) ([164b783](https://github.com/cube-js/cube/commit/164b783843efa93ac8ca422634e5b6daccd91883))
+- Support complex join conditions for grouped joins ([#9157](https://github.com/cube-js/cube/issues/9157)) ([28c1e3b](https://github.com/cube-js/cube/commit/28c1e3bba7a100f3152bfdefd86197e818fac941))
+
 ## [1.1.18](https://github.com/cube-js/cube/compare/v1.1.17...v1.1.18) (2025-01-27)
 
 ### Bug Fixes
diff --git a/docs/components/mdx/YouTubeVideo/YouTubeVideo.tsx b/docs/components/mdx/YouTubeVideo/YouTubeVideo.tsx
index 3b93d7c823..8af987caf2 100644
--- a/docs/components/mdx/YouTubeVideo/YouTubeVideo.tsx
+++ b/docs/components/mdx/YouTubeVideo/YouTubeVideo.tsx
@@ -6,13 +6,22 @@ const cn = classnames.bind(styles);
 
 export type YouTubeVideoProps = {
   url: string;
+  aspectRatio?: number;
 };
 
-export const YouTubeVideo = ({ url }: YouTubeVideoProps) => {
+function formatAspectRatioAsPercentage(aspectRatio: number) {
+  return `${((1 / aspectRatio) * 100).toFixed(2)}%`;
+}
+
+export const YouTubeVideo = ({ url, aspectRatio = 16/9 }: YouTubeVideoProps) => {
   return (
     <div
       className={cn('YoutubeVideo__Wrapper')}
-      style={{ position: 'relative', paddingBottom: '56.25%', height: 0 }}
+      style={{
+        position: 'relative',
+        paddingBottom: formatAspectRatioAsPercentage(aspectRatio),
+        height: 0
+      }}
     >
       <iframe
         src={url}
diff --git a/docs/pages/guides/dbt.mdx b/docs/pages/guides/dbt.mdx
index 995ea8fb2e..e338acd612 100644
--- a/docs/pages/guides/dbt.mdx
+++ b/docs/pages/guides/dbt.mdx
@@ -353,7 +353,7 @@ of the REST API.
 [ref-dimension-types]: /reference/data-model/types-and-formats#dimension-types
 [ref-data-graph]: /product/workspace/data-model#data-graph
 [ref-playground]: /product/workspace/playground
-[ref-rest-api-meta]: /reference/rest-api#v1meta
+[ref-rest-api-meta]: /product/apis-integrations/rest-api/reference#v1meta
 
 [link-dbt-docs]: https://docs.getdbt.com/docs/build/projects
 [link-dbt-docs-structure]: https://docs.getdbt.com/guides/best-practices/how-we-structure/1-guide-overview#guide-structure-overview
diff --git a/docs/pages/guides/recipes.mdx b/docs/pages/guides/recipes.mdx
index 5dfd8a4fbb..9eeb985822 100644
--- a/docs/pages/guides/recipes.mdx
+++ b/docs/pages/guides/recipes.mdx
@@ -31,6 +31,7 @@ These recipes will show you the best practices of using Cube.
 
 - [Calculating average and percentiles](/guides/recipes/data-modeling/percentiles)
 - [Calculating nested aggregates](/guides/recipes/data-modeling/nested-aggregates)
+- [Calculating filtered aggregates](/guides/recipes/data-modeling/filtered-aggregates)
 - [Calculating period-over-period changes](/guides/recipes/data-modeling/period-over-period)
 - [Implementing custom time dimension granularities](/guides/recipes/data-modeling/custom-granularity)
 - [Implementing Entity-Attribute-Value model](/guides/recipes/data-modeling/entity-attribute-value)
diff --git a/docs/pages/guides/recipes/access-control/controlling-access-to-cubes-and-views.mdx b/docs/pages/guides/recipes/access-control/controlling-access-to-cubes-and-views.mdx
index 91514035d9..f8b9421af5 100644
--- a/docs/pages/guides/recipes/access-control/controlling-access-to-cubes-and-views.mdx
+++ b/docs/pages/guides/recipes/access-control/controlling-access-to-cubes-and-views.mdx
@@ -52,9 +52,15 @@ cubes:
 views:
   - name: total_revenue_per_customer
     public: {{ COMPILE_CONTEXT['securityContext']['isFinance'] }}
-    includes:
-      - orders.total_revenue
-      - users.company
+
+    cubes:
+      - join_path: orders
+        includes:
+          - total_revenue
+
+      - join_path: orders.users
+        includes:
+          - company
 ```
 
 ```javascript
@@ -75,12 +81,25 @@ cube(`users`, {
 });
 
 // total_revenue_per_customer.js
-view("total_revenue_per_customer", {
+view(`total_revenue_per_customer`, {
   description: `Total revenue per customer`,
   public: COMPILE_CONTEXT.securityContext.isFinance,
 
-  includes: [orders.total_revenue, users.company],
-});
+  cubes: [
+    {
+      join_path: orders,
+      includes: [
+        `total_revenue`
+      ]
+    },
+    {
+      join_path: orders.users,
+      includes: [
+        `company`
+      ]
+    }
+  ]
+})
 ```
 
 </CodeTabs>
diff --git a/docs/pages/guides/recipes/auth/sql-api-ldap.mdx b/docs/pages/guides/recipes/auth/sql-api-ldap.mdx
index 55dc7da9b9..0524c677cc 100644
--- a/docs/pages/guides/recipes/auth/sql-api-ldap.mdx
+++ b/docs/pages/guides/recipes/auth/sql-api-ldap.mdx
@@ -5,7 +5,10 @@ API](/product/apis-integrations/sql-api) with a LDAP catalog. You can use
 this approach to enable single sign-on (SSO) experience in BI tools
 connecting to Cube for your end users.
 
-<YouTubeVideo url="https://www.youtube.com/embed/vGF7n4WWriA?si=RIk7G3a4lO2DnNJj"/>
+<YouTubeVideo
+  url="https://www.youtube.com/embed/vGF7n4WWriA"
+  aspectRatio={4/2.25}
+/>
 
 ## Use case
 
@@ -23,6 +26,13 @@ Here's a step-by-step breakdown of the authentication flow:
 * Cube verifies the credentials via the Secure LDAP service.
 * If credentials are correct, users get access to the dataset.
 
+<InfoBox>
+
+In this recipe, the SQL API is used to connect to [Power BI][ref-powerbi].
+Currently, it's recommended to use the [DAX API][ref-dax-api].
+
+</InfoBox>
+
 ## Configuration
 
 To verify the credentials, use the
@@ -174,4 +184,8 @@ module.exports = {
   }
 };
 
-```
\ No newline at end of file
+```
+
+
+[ref-dax-api]: /product/apis-integrations/dax-api
+[ref-powerbi]: /product/configuration/visualization-tools/powerbi
\ No newline at end of file
diff --git a/docs/pages/guides/recipes/data-exploration/cast-numerics.mdx b/docs/pages/guides/recipes/data-exploration/cast-numerics.mdx
index 437534db70..82da2d71c2 100644
--- a/docs/pages/guides/recipes/data-exploration/cast-numerics.mdx
+++ b/docs/pages/guides/recipes/data-exploration/cast-numerics.mdx
@@ -152,5 +152,5 @@ you work with "safe integers".
 [link-js-numbers]: https://www.w3schools.com/js/js_numbers.asp
 [link-mdn-max-safe-integer]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/MAX_SAFE_INTEGER
 
-[ref-cube-core]: /reference/frontend/cubejs-client-core
-[ref-cube-core-cast-numerics]: /reference/frontend/cubejs-client-core#loadmethodoptions
\ No newline at end of file
+[ref-cube-core]: http://localhost:3000/product/apis-integrations/javascript-sdk/reference/cubejs-client-core
+[ref-cube-core-cast-numerics]: http://localhost:3000/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#loadmethodoptions
\ No newline at end of file
diff --git a/docs/pages/guides/recipes/data-exploration/drilldowns.mdx b/docs/pages/guides/recipes/data-exploration/drilldowns.mdx
index 5736f5666e..ed330a0f51 100644
--- a/docs/pages/guides/recipes/data-exploration/drilldowns.mdx
+++ b/docs/pages/guides/recipes/data-exploration/drilldowns.mdx
@@ -99,6 +99,6 @@ cubes:
 You can follow [this tutorial][blog-drilldown-api] to learn more about building
 a UI for drilldowns.
 
-[ref-cube-client-ref-resultset-drilldown]: /reference/frontend/cubejs-client-core#drill-down
+[ref-cube-client-ref-resultset-drilldown]: /product/apis-integrations/javascript-sdk/reference/cubejs-client-core#drilldown
 [blog-drilldown-api]: https://cube.dev/blog/introducing-a-drill-down-table-api-in-cubejs/
 [ref-schema-ref-measures]: /reference/data-model/measures
\ No newline at end of file
diff --git a/docs/pages/guides/recipes/data-modeling/_meta.js b/docs/pages/guides/recipes/data-modeling/_meta.js
index bd9f5e7fc1..75766f495c 100644
--- a/docs/pages/guides/recipes/data-modeling/_meta.js
+++ b/docs/pages/guides/recipes/data-modeling/_meta.js
@@ -1,6 +1,7 @@
 module.exports = {
   "percentiles": "Calculating averages and percentiles",
   "nested-aggregates": "Calculating nested aggregates",
+  "filtered-aggregates": "Calculating filtered aggregates",
   "period-over-period": "Calculating period-over-period changes",
   "custom-granularity": "Implementing custom time dimension granularities",
   "snapshots": "Implementing data snapshots",
diff --git a/docs/pages/guides/recipes/data-modeling/filtered-aggregates.mdx b/docs/pages/guides/recipes/data-modeling/filtered-aggregates.mdx
new file mode 100644
index 0000000000..c71c7f77ca
--- /dev/null
+++ b/docs/pages/guides/recipes/data-modeling/filtered-aggregates.mdx
@@ -0,0 +1,198 @@
+# Calculating filtered aggregates
+
+## Use case
+
+Sometimes, there's a need to calculate an aggregation over facts in a joined cube that
+is filtered by a dimension from another cube. For example, you might want to calculate
+the total sales for a retailer. Each retailer has multiple stores, and each store does
+its own sales.
+
+If you set sales goals at the retailer level and are only interested in
+the sales that happened after a certain date, you would need to calculate the total sales
+in a way that only includes sales that happened after that date.
+
+## Data modeling
+
+We can model this scenario by creating a cube for each entity: `retailer`, `store`,
+and `sales`. The `retailer` cube has a one-to-many relationship with the `store` cube,
+and the `store` cube has a one-to-many relationship with the `sales` cube:
+
+```yml
+cubes:
+  - name: retailer
+    sql: >
+      SELECT 101 AS id, 'Retailer 1' AS name, 10 AS sales_goal, '2025-02-01Z'::TIMESTAMP AS goal_start UNION ALL
+      SELECT 102 AS id, 'Retailer 2' AS name, 10 AS sales_goal, '2025-02-01Z'::TIMESTAMP AS goal_start UNION ALL
+      SELECT 103 AS id, 'Retailer 3' AS name, 10 AS sales_goal, '2025-02-01Z'::TIMESTAMP AS goal_start
+
+    joins:
+      - name: store
+        sql: '{CUBE.id} = {store.retailer_id}'
+        relationship: one_to_many
+
+    dimensions:
+      - name: id
+        sql: "{CUBE}.id"
+        type: number
+        primary_key: true
+      
+      - name: name
+        sql: "{CUBE}.name"
+        type: string
+      
+      - name: goal_start
+        sql: "{CUBE}.goal_start"
+        type: time
+
+      - name: sales
+        sql: "{store.total_sales}"
+        type: number
+        sub_query: true
+
+      - name: sales_for_goal
+        sql: "{store.total_sales_for_goal}"
+        type: number
+        sub_query: true
+    
+    measures:
+      - name: sales_goal
+        sql: "{CUBE}.sales_goal"
+        type: sum
+
+      - name: sales_goal_achieved
+        type: number
+        sql: "({CUBE.sales_for_goal} / NULLIF({CUBE.sales_goal}, 0))"
+
+  - name: store
+    sql: >
+      SELECT 201 AS id, 'Store 1' AS name, 101 AS retailer_id UNION ALL
+      SELECT 202 AS id, 'Store 2' AS name, 101 AS retailer_id UNION ALL
+      SELECT 203 AS id, 'Store 3' AS name, 101 AS retailer_id UNION ALL
+      SELECT 204 AS id, 'Store 4' AS name, 102 AS retailer_id UNION ALL
+      SELECT 205 AS id, 'Store 5' AS name, 102 AS retailer_id UNION ALL
+      SELECT 206 AS id, 'Store 6' AS name, 102 AS retailer_id UNION ALL
+      SELECT 207 AS id, 'Store 7' AS name, 103 AS retailer_id UNION ALL
+      SELECT 208 AS id, 'Store 8' AS name, 103 AS retailer_id UNION ALL
+      SELECT 209 AS id, 'Store 9' AS name, 103 AS retailer_id
+
+    joins:
+      - name: sales
+        sql: '{CUBE.id} = {sales.store_id}'
+        relationship: one_to_many
+
+    dimensions:
+      - name: id
+        sql: "{CUBE}.id"
+        type: number
+        primary_key: true
+      
+      - name: name
+        sql: "{CUBE}.name"
+        type: string
+      
+      - name: retailer_id
+        sql: "{CUBE}.retailer_id"
+        type: number
+
+      - name: goal_start
+        sql: "{retailer.goal_start}"
+        type: time
+
+      - name: sales
+        sql: "{sales.total_sales}"
+        type: number
+        sub_query: true
+
+      - name: sales_for_goal
+        sql: "{sales.total_sales_for_goal}"
+        type: number
+        sub_query: true
+
+    measures:
+      - name: total_sales
+        sql: "{CUBE.sales}"
+        type: sum
+
+      - name: total_sales_for_goal
+        sql: "{CUBE.sales_for_goal}"
+        type: sum
+
+  - name: sales
+    sql: >
+      SELECT 301 AS id, 201 AS store_id, '2025-01-01Z'::TIMESTAMP AS order_date, 1 AS sales UNION ALL
+      SELECT 302 AS id, 202 AS store_id, '2025-01-01Z'::TIMESTAMP AS order_date, 1 AS sales UNION ALL
+      SELECT 303 AS id, 203 AS store_id, '2025-01-01Z'::TIMESTAMP AS order_date, 1 AS sales UNION ALL
+      SELECT 304 AS id, 204 AS store_id, '2025-01-01Z'::TIMESTAMP AS order_date, 3 AS sales UNION ALL
+      SELECT 305 AS id, 205 AS store_id, '2025-01-01Z'::TIMESTAMP AS order_date, 3 AS sales UNION ALL
+      SELECT 306 AS id, 206 AS store_id, '2025-01-01Z'::TIMESTAMP AS order_date, 3 AS sales UNION ALL
+      SELECT 307 AS id, 207 AS store_id, '2025-01-01Z'::TIMESTAMP AS order_date, 5 AS sales UNION ALL
+      SELECT 308 AS id, 208 AS store_id, '2025-01-01Z'::TIMESTAMP AS order_date, 5 AS sales UNION ALL
+      SELECT 309 AS id, 209 AS store_id, '2025-01-01Z'::TIMESTAMP AS order_date, 5 AS sales UNION ALL
+      SELECT 310 AS id, 201 AS store_id, '2025-02-01Z'::TIMESTAMP AS order_date, 1 AS sales UNION ALL
+      SELECT 311 AS id, 202 AS store_id, '2025-02-01Z'::TIMESTAMP AS order_date, 1 AS sales UNION ALL
+      SELECT 312 AS id, 203 AS store_id, '2025-02-01Z'::TIMESTAMP AS order_date, 1 AS sales UNION ALL
+      SELECT 313 AS id, 204 AS store_id, '2025-02-01Z'::TIMESTAMP AS order_date, 3 AS sales UNION ALL
+      SELECT 314 AS id, 205 AS store_id, '2025-02-01Z'::TIMESTAMP AS order_date, 3 AS sales UNION ALL
+      SELECT 315 AS id, 206 AS store_id, '2025-02-01Z'::TIMESTAMP AS order_date, 3 AS sales UNION ALL
+      SELECT 316 AS id, 207 AS store_id, '2025-02-01Z'::TIMESTAMP AS order_date, 5 AS sales UNION ALL
+      SELECT 317 AS id, 208 AS store_id, '2025-02-01Z'::TIMESTAMP AS order_date, 5 AS sales UNION ALL
+      SELECT 318 AS id, 209 AS store_id, '2025-02-01Z'::TIMESTAMP AS order_date, 5 AS sales
+
+    dimensions:
+      - name: id
+        sql: "{CUBE}.id"
+        type: number
+        primary_key: true 
+
+      - name: store_id
+        sql: "{CUBE}.store_id"
+        type: number
+      
+      - name: order_date
+        sql: "{CUBE}.order_date"
+        type: time
+
+      - name: goal_start
+        sql: "{store.goal_start}"
+        type: time
+      
+      - name: sales
+        sql: "{CUBE}.sales"
+        type: number
+      
+    measures:
+      - name: total_sales
+        sql: "{CUBE.sales}"
+        type: sum
+
+      - name: total_sales_for_goal
+        sql: "{CUBE.sales}"
+        type: sum
+        filters:
+          - sql: "{CUBE.order_date} >= {CUBE.goal_start}"
+```
+
+The total sales for a store and total sales for a retailer are calculated via [subquery
+dimensions][ref-subquery-dimension]. If you look at the join path (`retailer.store.sales`),
+you would see the _upstream flow_ of data: the aggregation over sales is passed from the
+`sales` cube to the `store` cube and then to the `retailer` cube.
+
+At the same time, the `goal_start` date is passed from the `retailer` cube to the `store`
+cube and then to the `sales` cube, creating the _downstream flow_ of data. This way, the
+`total_sales_for_goal` measure in the `sales` cube can be filtered by the `goal_start` date.
+
+This pattern of passing measures (aggregates) _upstream_ by the join path and passing
+dimensions _downstream_ is an effective way to solve many data modeling tasks, including
+calculating filtered aggregates.
+
+
+## Result
+
+Querying the `retailer` cube will return the total sales for each retailer and the total
+sales for each retailer after the `goal_start` date. The `sales_goal_achieved` measure
+will show the ratio of the sales goal that has been achieved:
+
+<Screenshot src="https://ucarecdn.com/80b74f38-a1ef-4b94-a3ff-146f06dc539f/"/>
+
+
+[ref-subquery-dimension]: /product/data-modeling/concepts/calculated-members#subquery-dimensions
\ No newline at end of file
diff --git a/docs/pages/guides/recipes/multitenancy/custom-data-model-per-tenant.mdx b/docs/pages/guides/recipes/multitenancy/custom-data-model-per-tenant.mdx
index 6c0745196e..e9120696c2 100644
--- a/docs/pages/guides/recipes/multitenancy/custom-data-model-per-tenant.mdx
+++ b/docs/pages/guides/recipes/multitenancy/custom-data-model-per-tenant.mdx
@@ -67,10 +67,10 @@ module.exports = {
 
 ## Data modeling
 
-### Customizing publicity
+### Customizing member-level access
 
-The simplest way to customize the data models is by changing the [publicity][ref-publicity]
-of data model entities. It works great for use cases when tenants share parts of
+The simplest way to customize the data models is by changing the [member-level access][ref-mls]
+to data model entities. It works great for use cases when tenants share parts of
 their data models.
 
 By setting the `public` parameter of [cubes][ref-cubes-public], [views][ref-views-public],
@@ -168,7 +168,7 @@ cube(`cube_x`, {
 
 </CodeTabs>
 
-For your convenience, [Playground][ref-playground] ignores publicity configration
+For your convenience, [Playground][ref-playground] ignores member-level access configration
 and marks data model entities that are not accessible for querying through
 [APIs][ref-apis] with the lock icon.
 
@@ -182,8 +182,8 @@ And here's the *perspective* of `Bob`:
 
 ### Customizing other parameters
 
-Similarly to [customizing publicity](#customizing-publicity), you can set other
-parameters of data model entities for each tenant individually:
+Similarly to [customizing member-level access](#customizing-member-level-access),
+you can set other parameters of data model entities for each tenant individually:
 
 - By setting `sql` or [`sql_table` parameters][ref-cube-sql-table] of cubes, you
 can ensure that each tenant accesses data from its own tables or database schemas.
@@ -364,7 +364,7 @@ code that fetches data model files for each tenant.
 [ref-scheduled-refresh-contexts]: /reference/configuration/config#scheduled_refresh_contexts
 [ref-context-to-app-id]: /reference/configuration/config#context_to_app_id
 [ref-config-files]: /product/configuration#cubepy-and-cubejs-files
-[ref-publicity]: /product/data-modeling/concepts/publicity
+[ref-mls]: /product/auth/member-level-security
 [ref-cubes-public]: /reference/data-model/cube#public
 [ref-views-public]: /reference/data-model/view#public
 [ref-measures-public]: /reference/data-model/measures#public
diff --git a/docs/pages/guides/recipes/queries/getting-unique-values-for-a-field.mdx b/docs/pages/guides/recipes/queries/getting-unique-values-for-a-field.mdx
index 0347a31ca6..e296a7cd85 100644
--- a/docs/pages/guides/recipes/queries/getting-unique-values-for-a-field.mdx
+++ b/docs/pages/guides/recipes/queries/getting-unique-values-for-a-field.mdx
@@ -90,7 +90,7 @@ dropdown on the dashboard:
 
 In case we need to choose a dimension or render dropdowns for all dimensions, we
 can fetch the list of dimensions for all cubes from the
-[`/meta` endpoint](/reference/rest-api#v1meta):
+[`/meta` endpoint](/product/apis-integrations/rest-api/reference#v1meta):
 
 ```bash
 curl http://localhost:4000/cubejs-api/v1/meta
diff --git a/docs/pages/guides/recipes/queries/pagination.mdx b/docs/pages/guides/recipes/queries/pagination.mdx
index 9e774778f1..c4dc412a07 100644
--- a/docs/pages/guides/recipes/queries/pagination.mdx
+++ b/docs/pages/guides/recipes/queries/pagination.mdx
@@ -20,7 +20,7 @@ We have the following data model:
 
 ```yaml
 cubes:
-  - name: Orders
+  - name: orders
     sql_table: orders
 
     measures:
@@ -38,7 +38,7 @@ cubes:
 ```
 
 ```javascript
-cube(`Orders`, {
+cube(`orders`, {
   sql_table: `orders`,
 
   measures: {
diff --git a/docs/pages/guides/style-guide.mdx b/docs/pages/guides/style-guide.mdx
index 1e4bc38e62..8224e1cc01 100644
--- a/docs/pages/guides/style-guide.mdx
+++ b/docs/pages/guides/style-guide.mdx
@@ -70,12 +70,14 @@ cube_project
   - `description`
   - `public`
   - `refresh_key`
+  - `meta`
   - `pre_aggregations`
   - `joins`
   - `dimensions`
   - `hierarchies`
   - `segments`
   - `measures`
+  - `access_policy`
 
 ### Dimensions & measures
 
@@ -141,6 +143,7 @@ cubes:
   - `public`
   - `cubes`
   - `folders`
+  - `access_policy`
 
 ### Example view
 
diff --git a/docs/pages/product/_meta.js b/docs/pages/product/_meta.js
index d1326632af..fd3fb9b793 100644
--- a/docs/pages/product/_meta.js
+++ b/docs/pages/product/_meta.js
@@ -4,7 +4,7 @@ module.exports = {
   "configuration": "Configuration",
   "data-modeling": "Data modeling",
   "caching": "Caching",
-  "auth": "Authentication & authorization",
+  "auth": "Access control",
   "apis-integrations": "APIs & integrations",
   "workspace": "Workspace",
   "deployment": "Deployment",
diff --git a/docs/pages/product/apis-integrations.mdx b/docs/pages/product/apis-integrations.mdx
index ebd26c51a3..22abec4f2c 100644
--- a/docs/pages/product/apis-integrations.mdx
+++ b/docs/pages/product/apis-integrations.mdx
@@ -9,37 +9,36 @@ With a rich set of APIs, Cube can power and deliver data to all kinds of data
 applications.
 
 [Data APIs](#data-apis) are used to run queries against the data model.
-Despite using various transports and query formats, all data APIs share common
+Despite varying protocols and query formats, all data APIs share common
 [querying concepts][ref-queries].
 
-<Diagram src="https://ucarecdn.com/023ca78a-aa96-493a-9799-95955a6d8948/" />
+<Diagram src="https://ucarecdn.com/4abc9729-66a3-489f-9d48-0bf27e728c87/" />
 
 Also, there are [management APIs](#management-apis) to control Cube deployments
 externally.
 
-<Diagram src="https://ucarecdn.com/8b9c0a27-c9bf-4f32-86b7-223c9fae8cc8/" />
+<Diagram src="https://ucarecdn.com/3ff02e30-a010-480d-b6d6-3b927baa0dfe/" />
 
 ## Data APIs
 
 A few rules of thumb to help you choose an API:
 
-* When implementing internal or self-serve [business intelligence][cube-issbi] use
-case, pick the [SQL API][ref-sql-api] and [Semantic Layer Sync][ref-sls]. The
-SQL API allows querying Cube with a Postgres-compatible [dialect of
-SQL][ref-sql-syntax], either by writing queries manually or generating them with
-BI tools.
+* To connect to [Microsoft Power BI][ref-powerbi], use the [DAX API][ref-dax-api].
 
-* To connect to Microsoft Excel, use the [MDX API][ref-mdx-api]. To connect to
-Google Sheets, use [Cube Cloud for Sheets][ref-cube-cloud-for-sheets].
+* To connect to [Microsoft Excel][ref-excel], use either the [MDX API][ref-mdx-api]
+or [Cube Cloud for Excel][ref-cube-cloud-for-excel].
 
-* When implementing [embedded analytics][cube-ea] and [real-time
-analytics][cube-rta] use cases, pick [REST API][ref-rest-api] or [GraphQL
-API][ref-graphql-api]. Also, the [JavaScript SDK][ref-js-sdk] will simplify
-integration with your front-end code. The REST API uses a [JSON-based query
-format][ref-json-syntax], and the GraphQL API accepts [GraphQL
-queries][ref-graphql-syntax].
+* To connect to [Google Sheets][ref-sheets], use [Cube Cloud for Sheets][ref-cube-cloud-for-sheets].
 
-* For AI use cases, consider using the [AI API][ref-ai-api].
+* For internal or self-serve [business intelligence][cube-issbi], use
+[Semantic Layer Sync][ref-sls] in case it supports your BI tools.
+Otherwise, connect via the [SQL API][ref-sql-api] directly.
+
+* For [embedded analytics][cube-ea] and [real-time analytics][cube-rta], use
+[REST API][ref-rest-api] or [GraphQL API][ref-graphql-api]. When using the REST API,
+the [JavaScript SDK][ref-js-sdk] can simplify integration with your front-end code.
+
+* For AI use cases, use the [AI API][ref-ai-api].
 
 <ReferenceBox>
 
@@ -48,15 +47,26 @@ for an unofficial, community-maintained [client library for Python](https://gith
 
 </ReferenceBox>
 
-### Support for data modeling
+### Data modeling
 
 Support for data modeling features differ across APIs, integrations, and [visualization
 tools][ref-viz-tools]. Some of the features with partial support are listed below:
 
-| Feature | Supported in | Not supported in |
+| Feature | ✅ Supported in | ❌ Not supported in |
 | --- | --- | --- |
-| [Hierarchies][ref-hierarchies] | ✅ [Tableau][ref-tableau] via [Semantic Layer Sync][ref-sls]<br/>✅ Cube Cloud for Excel<br/>✅ [Cube Cloud for Sheets][ref-cube-cloud-for-sheets] | ❌ All other tools |
-| [Folders][ref-folders] | ✅ [Tableau][ref-tableau] via [Semantic Layer Sync][ref-sls]<br/>✅ Cube Cloud for Excel<br/>✅ [Cube Cloud for Sheets][ref-cube-cloud-for-sheets] | ❌ All other tools |
+| [Hierarchies][ref-hierarchies] | [Microsoft Power BI][ref-powerbi] via the [DAX API][ref-dax-api]<br/>[Cube Cloud for Excel][ref-cube-cloud-for-excel]<br/>[Cube Cloud for Sheets][ref-cube-cloud-for-sheets]<br/>[Tableau][ref-tableau] via [Semantic Layer Sync][ref-sls] | All other tools |
+| [Folders][ref-folders] | [Microsoft Power BI][ref-powerbi] via the [DAX API][ref-dax-api]<br/>[Cube Cloud for Excel][ref-cube-cloud-for-excel]<br/>[Cube Cloud for Sheets][ref-cube-cloud-for-sheets]<br/>[Tableau][ref-tableau] via [Semantic Layer Sync][ref-sls] | All other tools |
+
+### Authentication methods
+
+Support for authentication methods differ across APIs, integrations, and [visualization
+tools][ref-viz-tools]:
+
+| Method | ✅ Supported in |
+| --- | --- |
+| [User name and password][ref-auth-user-pass] | [DAX API][ref-dax-api]<br/>[MDX API][ref-mdx-api]<br/>[Semantic Layer Sync][ref-sls]<br/>[SQL API][ref-sql-api] |
+| [Identity provider][ref-auth-idp] | [Cube Cloud for Excel][ref-cube-cloud-for-excel]<br/>[Cube Cloud for Sheets][ref-cube-cloud-for-sheets] |
+| [Access token][ref-auth-tokens] | [REST API][ref-rest-api]<br/>[GraphQL API][ref-graphql-api]<br/>[AI API][ref-ai-api] |
 
 ## Management APIs
 
@@ -68,6 +78,7 @@ API][ref-orchestration-api].
 [cube-ea]: https://cube.dev/use-cases/embedded-analytics
 [cube-rta]: https://cube.dev/use-cases/real-time-analytics
 [ref-queries]: /product/apis-integrations/queries
+[ref-dax-api]: /product/apis-integrations/dax-api
 [ref-sql-api]: /product/apis-integrations/sql-api
 [ref-rest-api]: /product/apis-integrations/rest-api
 [ref-graphql-api]: /product/apis-integrations/graphql-api
@@ -76,11 +87,15 @@ API][ref-orchestration-api].
 [ref-orchestration-api]: /product/apis-integrations/orchestration-api
 [ref-sls]: /product/apis-integrations/semantic-layer-sync
 [ref-js-sdk]: /product/apis-integrations/javascript-sdk
-[ref-sql-syntax]: /product/apis-integrations/sql-api#querying-fundamentals
-[ref-json-syntax]: /product/apis-integrations/rest-api/query-format
-[ref-graphql-syntax]: /product/apis-integrations/graphql-api#getting-started
+[ref-cube-cloud-for-excel]: /product/apis-integrations/microsoft-excel
 [ref-cube-cloud-for-sheets]: /product/apis-integrations/google-sheets
 [ref-viz-tools]: /product/configuration/visualization-tools
 [ref-hierarchies]: /reference/data-model/hierarchies
 [ref-folders]: /reference/data-model/view#folders
-[ref-tableau]: /product/configuration/visualization-tools/tableau
\ No newline at end of file
+[ref-powerbi]: /product/configuration/visualization-tools/powerbi
+[ref-excel]: /product/configuration/visualization-tools/excel
+[ref-sheets]: /product/configuration/visualization-tools/google-sheets
+[ref-tableau]: /product/configuration/visualization-tools/tableau
+[ref-auth-user-pass]: /product/auth#user-name-and-password
+[ref-auth-idp]: /product/auth#identity-provider
+[ref-auth-tokens]: /product/auth#access-token
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/_meta.js b/docs/pages/product/apis-integrations/_meta.js
index 46a8375df0..1061f3fdcd 100644
--- a/docs/pages/product/apis-integrations/_meta.js
+++ b/docs/pages/product/apis-integrations/_meta.js
@@ -1,11 +1,13 @@
 module.exports = {
   "queries": "Queries",
+  "dax-api": "DAX API",
+  "mdx-api": "MDX API",
+  "microsoft-excel": "Cube Cloud for Excel",
+  "google-sheets": "Cube Cloud for Sheets",
   "semantic-layer-sync": "Semantic Layer Sync",
   "sql-api": "SQL API",
   "rest-api": "REST API",
   "graphql-api": "GraphQL API",
-  "mdx-api": "MDX API",
-  "google-sheets": "Cube Cloud for Sheets",
   "ai-api": "AI API",
   "javascript-sdk": "JavaScript SDK",
   "orchestration-api": "Orchestration API",
diff --git a/docs/pages/product/apis-integrations/ai-api.mdx b/docs/pages/product/apis-integrations/ai-api.mdx
index ef7ae50c1d..62d075afcd 100644
--- a/docs/pages/product/apis-integrations/ai-api.mdx
+++ b/docs/pages/product/apis-integrations/ai-api.mdx
@@ -108,7 +108,7 @@ Use the `runQuery` request parameter to have the AI API run the query and report
 }
 ```
 
-The response will be the same as above, followed by a second JSON object representing the response (see the [REST API reference](/reference/rest-api#v1load) for its format).
+The response will be the same as above, followed by a second JSON object representing the response (see the [REST API reference](/product/apis-integrations/rest-api/reference#v1load) for its format).
 
 <InfoBox>
   Note that the response now contains two JSON objects separated by a newline
@@ -117,7 +117,7 @@ The response will be the same as above, followed by a second JSON object represe
 
 #### 2. `/load`
 
-Alternatively, you may take the generated `cube_query` from the response and then call the [REST API `/load` endpoint](/reference/rest-api#v1load) with it in the `/load` request body. This is recommended for advanced use-cases where you need more control over formatting, pagination, etc. or if you are adding the AI API to an existing Cube REST API implementation.
+Alternatively, you may take the generated `cube_query` from the response and then call the [REST API `/load` endpoint](/product/apis-integrations/rest-api/reference#v1load) with it in the `/load` request body. This is recommended for advanced use-cases where you need more control over formatting, pagination, etc. or if you are adding the AI API to an existing Cube REST API implementation.
 
 ### Error Handling
 
@@ -230,36 +230,125 @@ Search can only be used on string dimensions.
 
 If desired, you may "bring your own" LLM model by providing a model and API credentials
 for a supported model provider. Do this by setting environment variables in your Cube
-deployment. See below for required variables by provider (required unless noted):
+deployment.
+
+- `CUBE_CLOUD_AI_COMPLETION_MODEL` - The AI model name to use (varies based on provider). For example `gpt-4o`.
+- `CUBE_CLOUD_AI_COMPLETION_PROVIDER` - The provider. Must be one of the following:
+  - `amazon-bedrock`
+  - `anthropic`
+  - `azure`
+  - `cohere`
+  - `deepseek`
+  - `fireworks`
+  - `google-generative-ai`
+  - `google-vertex-ai`
+  - `google-vertex-ai-anthropic`
+  - `groq`
+  - `mistral`
+  - `openai`
+  - `openai-compatible` (any provider with an OpenAI-compatible API; support may vary)
+  - `together-ai`
+  - `x-ai`
+
+See below for required variables by provider (required unless noted):
 
 #### AWS Bedrock
 
 <WarningBox>
-  The AI API currently supports only Anthropic Claude models on AWS Bedrock. Other
-  models may work but are not fully supported.
+  The AI API currently supports only Anthropic Claude models on AWS Bedrock.
+  Other models may work but are not fully supported.
 </WarningBox>
 
-- `CUBE_BEDROCK_MODEL_ID` - A supported [AWS Bedrock chat model](https://docs.aws.amazon.com/bedrock/latest/userguide/models-supported.html), for example `anthropic.claude-3-5-sonnet-20241022-v2:0`
-- `CUBE_BEDROCK_ACCESS_KEY` - An access key for an IAM user with `InvokeModelWithResponseStream` permissions on the desired region/model.
-- `CUBE_BEDROCK_ACCESS_SECRET` - The corresponding access secret
-- `CUBE_BEDROCK_REGION_ID` - A supported AWS Bedrock region, for example `us-west-2`
+- `CUBE_CLOUD_AI_AWS_ACCESS_KEY_ID` - An access key for an IAM user with `InvokeModelWithResponseStream` permissions on the desired region/model.
+- `CUBE_CLOUD_AI_AWS_SECRET_ACCESS_KEY` - The corresponding access secret
+- `CUBE_CLOUD_AI_AWS_REGION` - A supported AWS Bedrock region, for example `us-west-2`
+- `CUBE_CLOUD_AI_AWS_SESSION_TOKEN` - The session token (optional)
 
-#### GCP Vertex
+#### Anthropic
+
+- `CUBE_CLOUD_AI_ANTHROPIC_API_KEY`
+- `CUBE_CLOUD_AI_ANTHROPIC_BASE_URL` - uses a different URL prefix for API calls, such as if you are using behind a proxy (optional)
+
+#### Microsoft Azure OpenAI
+
+- `CUBE_CLOUD_AI_AZURE_RESOURCE_NAME`
+- `CUBE_CLOUD_AI_AZURE_API_KEY`
+- `CUBE_CLOUD_AI_AZURE_API_VERSION` (optional)
+- `CUBE_CLOUD_AI_AZURE_BASE_URL` (optional)
+
+#### Cohere
+
+- `CUBE_CLOUD_AI_COHERE_API_KEY`
+- `CUBE_CLOUD_AI_COHERE_BASE_URL` - uses a different URL prefix for API calls, such as if you are using behind a proxy (optional)
+
+#### DeepSeek
+
+- `CUBE_CLOUD_AI_DEEPSEEK_API_KEY`
+- `CUBE_CLOUD_AI_DEEPSEEK_BASE_URL` - uses a different URL prefix for API calls, such as if you are using behind a proxy (optional)
+
+#### Fireworks
+
+- `CUBE_CLOUD_AI_FIREWORKS_API_KEY`
+- `CUBE_CLOUD_AI_FIREWORKS_BASE_URL` - uses a different URL prefix for API calls, such as if you are using behind a proxy (optional)
+
+#### Google Generative AI
+
+- `CUBE_CLOUD_AI_GOOGLE_GENERATIVE_AI_API_KEY`
+- `CUBE_CLOUD_AI_GOOGLE_GENERATIVE_AI_BASE_URL` - uses a different URL prefix for API calls, such as if you are using behind a proxy (optional)
+
+#### GCP Vertex AI
 
 <WarningBox>
-  The AI API currently supports only Anthropic Claude models on GCP Vertex. Other
-  models may work but are not fully supported.
+  See <Btn>Google Vertex AI (Anthropic)</Btn> below if using Anthropic models
 </WarningBox>
 
-- `CUBE_VERTEX_MODEL_ID` - A supported GCP Vertex chat model, for example `claude-3-5-sonnet@20240620`
-- `CUBE_VERTEX_PROJECT_ID` - The GCP project the model is deployed in
-- `CUBE_VERTEX_REGION` - The GCP region the model is deployed in, for example `us-east5`
-- `CUBE_VERTEX_CREDENTIALS` - The private key for a service account with permissions to run the chosen model
+- `CUBE_CLOUD_AI_GOOGLE_VERTEX_PROJECT`
+- `CUBE_CLOUD_AI_GOOGLE_VERTEX_LOCATION`
+- `CUBE_CLOUD_AI_GOOGLE_VERTEX_CREDENTIALS`
+- `CUBE_CLOUD_AI_GOOGLE_VERTEX_PUBLISHER` - defaults to `google`; change if using another publisher (optional)
+
+#### GCP Vertex AI (Anthropic)
+
+- `CUBE_CLOUD_AI_GOOGLE_VERTEX_ANTHROPIC_PROJECT`
+- `CUBE_CLOUD_AI_GOOGLE_VERTEX_ANTHROPIC_LOCATION`
+- `CUBE_CLOUD_AI_GOOGLE_VERTEX_ANTHROPIC_CREDENTIALS`
+- `CUBE_CLOUD_AI_GOOGLE_VERTEX_ANTHROPIC_PUBLISHER` - defaults to `anthropic`; change if using another publisher (optional)
+
+#### Groq
+
+- `CUBE_CLOUD_AI_GROQ_API_KEY`
+- `CUBE_CLOUD_AI_GROQ_BASE_URL` - uses a different URL prefix for API calls, such as if you are using behind a proxy (optional)
+
+#### Mistral
+
+- `CUBE_CLOUD_AI_MISTRAL_API_KEY`
+- `CUBE_CLOUD_AI_MISTRAL_BASE_URL` - uses a different URL prefix for API calls, such as if you are using behind a proxy (optional)
 
 #### OpenAI
 
-- `OPENAI_MODEL` - An OpenAI chat model ID, for example `gpt-4o`
-- `OPENAI_API_KEY` - An OpenAI API key (we recommend creating a service account for the AI API)
+- `CUBE_CLOUD_AI_OPENAI_API_KEY`
+- `CUBE_CLOUD_AI_OPENAI_ORGANIZATION` - (optional)
+- `CUBE_CLOUD_AI_OPENAI_PROJECT` - (optional)
+- `CUBE_CLOUD_AI_OPENAI_BASE_URL` - uses a different URL prefix for API calls, such as if you are using behind a proxy (optional)
+
+#### OpenAI Compatible Providers
+
+<InfoBox>
+  Use this provider if your provider is not listed on this page but provides an
+  OpenAI compatible endpoint. Not all providers/models are supported.
+</InfoBox>
+
+- `CUBE_CLOUD_AI_OPENAI_COMPATIBLE_API_KEY`
+- `CUBE_CLOUD_AI_OPENAI_COMPATIBLE_BASE_URL`
+
+#### Together AI
+
+- `CUBE_CLOUD_AI_TOGETHER_API_KEY`
+- `CUBE_CLOUD_AI_TOGETHER_BASE_URL` - uses a different URL prefix for API calls, such as if you are using behind a proxy (optional)
+
+#### xAI (Grok)
 
+- `CUBE_CLOUD_AI_X_AI_API_KEY`
+- `CUBE_CLOUD_AI_X_AI_BASE_URL` - uses a different URL prefix for API calls, such as if you are using behind a proxy (optional)
 
-[ref-ref-ai-api]: /reference/ai-api
\ No newline at end of file
+[ref-ref-ai-api]: /product/apis-integrations/ai-api/reference
diff --git a/docs/pages/product/apis-integrations/ai-api/_meta.js b/docs/pages/product/apis-integrations/ai-api/_meta.js
index 6da3f2236c..2ece3a20a6 100644
--- a/docs/pages/product/apis-integrations/ai-api/_meta.js
+++ b/docs/pages/product/apis-integrations/ai-api/_meta.js
@@ -1,3 +1,4 @@
 module.exports = {
   "privacy-security": "Privacy and Security",
+  "reference": "Reference"
 };
diff --git a/docs/pages/reference/ai-api.mdx b/docs/pages/product/apis-integrations/ai-api/reference.mdx
similarity index 100%
rename from docs/pages/reference/ai-api.mdx
rename to docs/pages/product/apis-integrations/ai-api/reference.mdx
diff --git a/docs/pages/product/apis-integrations/dax-api.mdx b/docs/pages/product/apis-integrations/dax-api.mdx
new file mode 100644
index 0000000000..c3178697f7
--- /dev/null
+++ b/docs/pages/product/apis-integrations/dax-api.mdx
@@ -0,0 +1,87 @@
+# DAX API
+
+The DAX API enables Cube to connect to [Microsoft Power BI][ref-powerbi].
+It derives its name from [data analysis expressions][link-dax], a query language
+for Power BI and SQL Server Analysis Services.
+
+Unlike the [SQL API][ref-sql-api], it provides a native experience and superior
+support for Power BI features.
+
+<SuccessBox>
+
+The DAX API is available in Cube Cloud on [Enterprise and above](https://cube.dev/pricing) product tiers.
+It also requires the M [deployment tier](/product/deployment/cloud/pricing#deployment-tiers).
+
+</SuccessBox>
+
+<WarningBox>
+
+The DAX API is currently in preview. Please [contact us](https://cube.dev/contact) to enable it for your account.
+
+</WarningBox>
+
+Read below about the DAX API [configuration](#configuration),
+[authentication](#authentication), and [using it](#using-dax-api-with-power-bi) with Power BI.
+
+See the [DAX API reference][ref-ref-dax-api] for the list of supported DAX functions.
+
+<YouTubeVideo
+  url="https://www.youtube.com/embed/vgrFPOMuJJs"
+  aspectRatio={8/5}
+/>
+
+## Configuration
+
+<WarningBox>
+
+Please contact the customer success team in Cube Cloud so we can guide you
+through the configuration.
+
+</WarningBox>
+
+To enable or disable the DAX API on a specific deployment, go to <Btn>Settings</Btn>
+in the Cube Cloud sidebar, then <Btn>Configuration</Btn>, and then toggle the
+<Btn>Enable DAX API</Btn> option.
+
+## Authentication
+
+The DAX API supports the user name and password authentication method.
+
+## Using DAX API with Power BI
+
+<InfoBox>
+
+The DAX API works only with [views][ref-views], not cubes.
+
+</InfoBox>
+
+{/*
+
+TODO
+
+*/}
+
+### Connection methods
+
+Power BI provides [three methods][link-powerbi-connection] to connect to data
+sources: _live connection_, _DirectQuery_, and _import mode_.
+
+| | Live connection | DirectQuery | <nobr>Import mode</nobr> |
+| --- | --- | --- | --- |
+| Data location | 🟢 Data source | 🟢 Data source | 🟡 Power BI |
+| Data freshness | 🟢 Real-time data | 🟢 Real-time data | 🟡 Stale copy |
+| Semantic model | <nobr>🟢 Up-to-date model</nobr> | 🟡 Stale copy | 🟡 Stale copy |
+| Queries | <nobr>🟢 Composed in UI</nobr><br/><nobr>🔴 No custom queries</nobr> | <nobr>🟢 Composed in UI</nobr><br/><nobr>🟢 Custom queries</nobr> | <nobr>🟢 Composed in UI</nobr><br/><nobr>🟢 Custom queries</nobr> |
+
+__It's recommended to use a _live connection_ whenever possible.__ Use _DirectQuery_
+if you need to write your own DAX queries, but be aware that you must manually
+synchronize semantic models as they evolve. _Import mode_ is not recommended, as
+it removes the benefits of using a semantic layer.
+
+
+[ref-powerbi]: /product/configuration/visualization-tools/powerbi
+[link-dax]: https://learn.microsoft.com/en-us/dax/
+[ref-sql-api]: /product/apis-integrations/sql-api
+[ref-ref-dax-api]: /product/apis-integrations/dax-api/reference
+[ref-views]: /product/data-modeling/concepts#views
+[link-powerbi-connection]: https://learn.microsoft.com/en-us/power-bi/connect-data/service-live-connect-dq-datasets
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/dax-api/_meta.js b/docs/pages/product/apis-integrations/dax-api/_meta.js
new file mode 100644
index 0000000000..84ba2fd7d3
--- /dev/null
+++ b/docs/pages/product/apis-integrations/dax-api/_meta.js
@@ -0,0 +1,3 @@
+module.exports = {
+  "reference": "Reference"
+}
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/dax-api/reference.mdx b/docs/pages/product/apis-integrations/dax-api/reference.mdx
new file mode 100644
index 0000000000..f3a10f88ae
--- /dev/null
+++ b/docs/pages/product/apis-integrations/dax-api/reference.mdx
@@ -0,0 +1,240 @@
+# DAX API reference
+
+The [DAX API][ref-dax-api] supports the following [functions](#dax-functions).
+
+<InfoBox>
+
+If you'd like to propose a function to be supported in the DAX API,
+please contact the customer success team in Cube Cloud.
+
+</InfoBox>
+
+## DAX functions
+
+The DAX API currently implements a subset of functions [supported by DAX][link-dax-func-reference].
+
+### Aggregation functions
+
+<InfoBox>
+
+Learn more in the
+[relevant section](https://learn.microsoft.com/en-us/dax/aggregation-functions-dax)
+of the DAX documentation.
+
+</InfoBox>
+
+| Function | <nobr>Unsupported features</nobr> | Caveats |
+| --- | --- | --- |
+| [`AVERAGE`](https://learn.microsoft.com/en-us/dax/average-function-dax) | — | — |
+| [`COUNT`](https://learn.microsoft.com/en-us/dax/count-function-dax) | — | — |
+| [`COUNTA`](https://learn.microsoft.com/en-us/dax/counta-function-dax) | — | — |
+| [`COUNTROWS`](https://learn.microsoft.com/en-us/dax/countrows-function-dax) | — | Disregards input table expression and always returns 1 |
+| [`DISTINCTCOUNT`](https://learn.microsoft.com/en-us/dax/distinctcount-function-dax) | — | Blanks are ignored |
+| [`MAX`](https://learn.microsoft.com/en-us/dax/max-function-dax) | 2 arguments | Blanks are disregarded instead of being treated as 0 |
+| [`MIN`](https://learn.microsoft.com/en-us/dax/min-function-dax) | 2 arguments | Blanks are disregarded instead of being treated as 0 |
+| [`SUM`](https://learn.microsoft.com/en-us/dax/sum-function-dax) | — | — |
+
+### Date and time functions
+
+<InfoBox>
+
+Learn more in the
+[relevant section](https://learn.microsoft.com/en-us/dax/date-and-time-functions-dax)
+of the DAX documentation.
+
+</InfoBox>
+
+| Function | <nobr>Unsupported features</nobr> | Caveats |
+| --- | --- | --- |
+| [`DATE`](https://learn.microsoft.com/en-us/dax/date-function-dax) | Non-literal date parts | — |
+| [`TIME`](https://learn.microsoft.com/en-us/dax/time-function-dax) | Non-literal date parts. Execution outside `DATE(...) + TIME(...)` expression | — |
+
+### Filter functions
+
+<InfoBox>
+
+Learn more in the
+[relevant section](https://learn.microsoft.com/en-us/dax/filter-functions-dax)
+of the DAX documentation.
+
+</InfoBox>
+
+| Function | <nobr>Unsupported features</nobr> | Caveats |
+| --- | --- | --- |
+| [`ALL`](https://learn.microsoft.com/en-us/dax/all-function-dax) | 2+ arguments | Doesn't clear filter context, silently ignored |
+| [`CALCULATE`](https://learn.microsoft.com/en-us/dax/calculate-function-dax) | Creating a nested filter context | — |
+| [`CALCULATETABLE`](https://learn.microsoft.com/en-us/dax/calculatetable-function-dax) | Creating a nested filter context | — |
+| [`FILTER`](https://learn.microsoft.com/en-us/dax/filter-function-dax) | — | — |
+| [`KEEPFILTERS`](https://learn.microsoft.com/en-us/dax/keepfilters-function-dax) | — | Doesn't modify behavior, silently ignored |
+
+### Financial functions
+
+<InfoBox>
+
+Learn more in the
+[relevant section](https://learn.microsoft.com/en-us/dax/financial-functions-dax)
+of the DAX documentation.
+
+</InfoBox>
+
+No financial functions currently supported.
+
+### Information functions
+
+<InfoBox>
+
+Learn more in the
+[relevant section](https://learn.microsoft.com/en-us/dax/information-functions-dax)
+of the DAX documentation.
+
+</InfoBox>
+
+| Function | <nobr>Unsupported features</nobr> | Caveats |
+| --- | --- | --- |
+| [`ISBLANK`](https://learn.microsoft.com/en-us/dax/isblank-function-dax) | — | Blanks are treated as equivalent to nulls and vice versa |
+| [`ISONORAFTER`](https://learn.microsoft.com/en-us/dax/isonorafter-function-dax) | — | — |
+| [`NONVISUAL`](https://learn.microsoft.com/en-us/dax/nonvisual-function-dax) | — | Doesn't modify behavior, silently ignored |
+
+### Logical functions
+
+<InfoBox>
+
+Learn more in the
+[relevant section](https://learn.microsoft.com/en-us/dax/logical-functions-dax)
+of the DAX documentation.
+
+</InfoBox>
+
+| Function | <nobr>Unsupported features</nobr> | Caveats |
+| --- | --- | --- |
+| [`AND`](https://learn.microsoft.com/en-us/dax/and-function-dax) | — | — |
+| [`NOT`](https://learn.microsoft.com/en-us/dax/not-function-dax) | — | — |
+| [`OR`](https://learn.microsoft.com/en-us/dax/or-function-dax) | — | — |
+
+### Math and trig functions
+
+<InfoBox>
+
+Learn more in the
+[relevant section](https://learn.microsoft.com/en-us/dax/math-and-trig-functions-dax)
+of the DAX documentation.
+
+</InfoBox>
+
+No math and trig functions currently supported.
+
+### Other functions
+
+<InfoBox>
+
+Learn more in the
+[relevant section](https://learn.microsoft.com/en-us/dax/other-functions-dax)
+of the DAX documentation.
+
+</InfoBox>
+
+| Function | <nobr>Unsupported features</nobr> | Caveats |
+| --- | --- | --- |
+| [`BLANK`](https://learn.microsoft.com/en-us/dax/blank-function-dax) | — | Blanks are treated as equivalent to nulls and vice versa |
+
+### Parent and child functions
+
+<InfoBox>
+
+Learn more in the
+[relevant section](https://learn.microsoft.com/en-us/dax/parent-and-child-functions-dax)
+of the DAX documentation.
+
+</InfoBox>
+
+No parent and child functions currently supported.
+
+### Relationship functions
+
+<InfoBox>
+
+Learn more in the
+[relevant section](https://learn.microsoft.com/en-us/dax/relationship-functions-dax)
+of the DAX documentation.
+
+</InfoBox>
+
+No relationship functions currently supported.
+
+### Statistical functions
+
+<InfoBox>
+
+Learn more in the
+[relevant section](https://learn.microsoft.com/en-us/dax/statistical-functions-dax)
+of the DAX documentation.
+
+</InfoBox>
+
+| Function | <nobr>Unsupported features</nobr> | Caveats |
+| --- | --- | --- |
+| [`SAMPLE`](https://learn.microsoft.com/en-us/dax/sample-function-dax) | — | Doesn't evenly distribute rows, taking top N instead (acts as the `TOPN` function) |
+
+### Table manipulation functions
+
+<InfoBox>
+
+Learn more in the
+[relevant section](https://learn.microsoft.com/en-us/dax/table-manipulation-functions-dax)
+of the DAX documentation.
+
+</InfoBox>
+
+| Function | <nobr>Unsupported features</nobr> | Caveats |
+| --- | --- | --- |
+| [`ADDCOLUMNS`](https://learn.microsoft.com/en-us/dax/addcolumns-function-dax) | Aggregate expressions | — |
+| <nobr>[`DISTINCT`](https://learn.microsoft.com/en-us/dax/distinct-function-dax) (column)</nobr> | — | — |
+| <nobr>[`DISTINCT`](https://learn.microsoft.com/en-us/dax/distinct-table-function-dax) (table)</nobr> | Filter context for table expressions | — |
+| [`IGNORE`](https://learn.microsoft.com/en-us/dax/ignore-function-dax) | 2+ arguments | Doesn't modify filter context, silently ignored |
+| [`NATURALLEFTOUTERJOIN`](https://learn.microsoft.com/en-us/dax/naturalleftouterjoin-function-dax) | — | — |
+| [`ROLLUPADDISSUBTOTAL`](https://learn.microsoft.com/en-us/dax/rollupaddissubtotal-function-dax) | `grandtotalFilter` | — |
+| [`ROLLUPGROUP`](https://learn.microsoft.com/en-us/dax/rollupgroup-function-dax) | — | — |
+| [`ROW`](https://learn.microsoft.com/en-us/dax/row-function-dax) | — | — |
+| [`SELECTCOLUMNS`](https://learn.microsoft.com/en-us/dax/selectcolumns-function-dax) | Optional aliases (currently mandatory) | — |
+| [`SUBSTITUTEWITHINDEX`](https://learn.microsoft.com/en-us/dax/substitutewithindex-function-dax) | — | — |
+| [`SUMMARIZE`](https://learn.microsoft.com/en-us/dax/summarize-function-dax) | Named expressions (aggregations/measures) | — |
+| [`SUMMARIZECOLUMNS`](https://learn.microsoft.com/en-us/dax/summarizecolumns-function-dax) | — | — |
+| [`TOPN`](https://learn.microsoft.com/en-us/dax/topn-function-dax) | Non-literal N value | — |
+| [`TREATAS`](https://learn.microsoft.com/en-us/dax/treatas-function-dax) | Non-literal tables as table expressions | — |
+| [`VALUES`](https://learn.microsoft.com/en-us/dax/values-function-dax) | — | — |
+
+### Text functions
+
+<InfoBox>
+
+Learn more in the
+[relevant section](https://learn.microsoft.com/en-us/dax/text-functions-dax)
+of the DAX documentation.
+
+</InfoBox>
+
+| Function | <nobr>Unsupported features</nobr> | Caveats |
+| --- | --- | --- |
+| [`SEARCH`](https://learn.microsoft.com/en-us/dax/search-function-dax) | Execution outside filter context functions | — |
+
+### Time intelligence functions
+
+<InfoBox>
+
+Learn more in the
+[relevant section](https://learn.microsoft.com/en-us/dax/time-intelligence-functions-dax)
+of the DAX documentation.
+
+</InfoBox>
+
+No time intelligence functions currently supported.
+
+### Miscellaneous functions
+
+| Function | <nobr>Unsupported features</nobr> | Caveats |
+| --- | --- | --- |
+| [`SAMPLEAXISWITHLOCALMINMAX`](https://learn.microsoft.com/en-us/dax/sampleaxiswithlocalminmax-function-dax) | — | Silently ignored, returning input table expression |
+
+
+[ref-dax-api]: /product/apis-integrations/dax-api
+[link-dax-func-reference]: https://learn.microsoft.com/en-us/dax/dax-function-reference
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/google-sheets.mdx b/docs/pages/product/apis-integrations/google-sheets.mdx
index ea48d1e69e..b4c8779832 100644
--- a/docs/pages/product/apis-integrations/google-sheets.mdx
+++ b/docs/pages/product/apis-integrations/google-sheets.mdx
@@ -1,6 +1,6 @@
 # Cube Cloud for Sheets
 
-Cube Cloud for Sheets is a native [Google Sheets][link-google-sheets] add-on for
+Cube Cloud for Sheets is the native [Google Sheets][link-google-sheets] add-on for
 Cube Cloud.
 
 <SuccessBox>
@@ -10,12 +10,20 @@ above](https://cube.dev/pricing) product tiers.
 
 </SuccessBox>
 
-After [installing](#installation) and [authenticating](#authentication) this
-add-on, you will be able to [create reports via pivot
-table](#create-reports-via-pivot-table) and work with [saved
+After [configuring](#configuration), [installing](#installation), and
+[authenticating](#authentication) this add-on, you will be able to [create
+reports via pivot table](#create-reports-via-pivot-table) and work with [saved
 reports](#work-with-saved-reports).
 
-<YouTubeVideo url="https://www.youtube.com/embed/qPp9hroqd4g"/>
+<YouTubeVideo
+  url="https://www.youtube.com/embed/qPp9hroqd4g"
+  aspectRatio={4/2.56}
+/>
+
+## Configuration
+
+Cube Cloud for Sheets uses the SQL API internally. So, the SQL API has to be
+[enabled][ref-sql-api-enabled] in the Cube Cloud deployment settings.
 
 ## Installation
 
@@ -39,20 +47,18 @@ document, open the <Btn>Extensions</Btn> menu, and check that there is the
 
 ## Authentication
 
-You need to authenticate Cube Cloud for Sheets to retrieve data from your
-semantic layer in Cube Cloud. To do so, open the sidebar by going to the
-<Btn>Extensions</Btn> menu and choosing <Btn>Cube Cloud for Sheets → Open
-Sidebar</Btn>. Then, click <Btn>Sign in</Btn>.
+You need to authenticate Cube Cloud for Sheets to retrieve data from Cube Cloud.
+To do so, open the sidebar by going to the <Btn>Extensions</Btn> menu and choosing
+<Btn>Cube Cloud for Sheets → Open Sidebar</Btn>. Then, click <Btn>Sign in</Btn>.
 
 <Screenshot
   src="https://ucarecdn.com/d47c8faa-97ed-4ce1-ba0e-99b7add1ab61/"
   highlight="inset(15% 0 55% 76.5% round 10px)"
 />
 
-A modal window with an authentication prompt will open. Choose the deployments
-within your Cube Cloud account that you want to work with in Google Sheets and
-click <Btn>Authorize</Btn>. Once you see the `Access Granted` message, close the
-modal window.
+A modal window with an authentication prompt will appear. Choose the deployments
+that you want to work with in Google Sheets and click <Btn>Authorize</Btn>.
+Once you see the `Access Granted` message, close the modal window.
 
 If you want to revoke the authentication, open the add-on menu and click
 <Btn>Sign out</Btn>.
@@ -62,11 +68,11 @@ If you want to revoke the authentication, open the add-on menu and click
 To create a report, go to the add-on menu and click <Btn>Create report via pivot
 table</Btn>. Then, select a Cube Cloud deployment from the drop-down. Finally,
 you can start building a query by selecting a view and its members in the UI that
-looks and feel exactly like [Playground][ref-playground].
+looks and feels like [Playground][ref-playground].
 
 <InfoBox>
 
-Google Cloud for Sheets only works with [views][ref-views] rather than cubes.
+Google Cloud for Sheets works only with [views][ref-views], not cubes.
 
 </InfoBox>
 
@@ -116,4 +122,5 @@ Click <Btn>Edit</Btn> to chnage the query or the location.
 [link-marketplace-listing]: https://workspace.google.com/u/0/marketplace/app/cube_cloud_for_sheets/641460343379
 [ref-playground]: /product/workspace/playground
 [ref-views]: /product/data-modeling/concepts#views
-[ref-pre-aggs]: /product/caching/using-pre-aggregations
\ No newline at end of file
+[ref-pre-aggs]: /product/caching/using-pre-aggregations
+[ref-sql-api-enabled]: /product/apis-integrations/sql-api#cube-cloud
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/graphql-api.mdx b/docs/pages/product/apis-integrations/graphql-api.mdx
index 16f6df086d..5016433b96 100644
--- a/docs/pages/product/apis-integrations/graphql-api.mdx
+++ b/docs/pages/product/apis-integrations/graphql-api.mdx
@@ -233,10 +233,10 @@ to our query as follows:
 [ref-cors]: /product/apis-integrations/rest-api#configuration-cors
 [graphql]: https://graphql.org
 [cube-ea]: https://cube.dev/use-cases/embedded-analytics
-[ref-ref-graphql-api]: /reference/graphql-api
+[ref-ref-graphql-api]: /product/apis-integrations/graphql-api/reference
 [ref-websockets]: /product/apis-integrations/rest-api/real-time-data-fetch#web-sockets
 [ref-subscriptions]: /product/apis-integrations/rest-api/real-time-data-fetch#client-subscriptions
 [ref-compare-date-range]: /product/apis-integrations/queries#compare-date-range-query
-[ref-metadata]: /reference/rest-api#v1meta
-[ref-pivot-config]: /reference/frontend/cubejs-client-core#pivotconfig
+[ref-metadata]: /product/apis-integrations/rest-api/reference#v1meta
+[ref-pivot-config]: /product/apis-integrations/javascript-sdk/reference/cubejs-client-core#pivotconfig
 [ref-segments]: /reference/data-model/segments
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/graphql-api/_meta.js b/docs/pages/product/apis-integrations/graphql-api/_meta.js
new file mode 100644
index 0000000000..84ba2fd7d3
--- /dev/null
+++ b/docs/pages/product/apis-integrations/graphql-api/_meta.js
@@ -0,0 +1,3 @@
+module.exports = {
+  "reference": "Reference"
+}
\ No newline at end of file
diff --git a/docs/pages/reference/graphql-api.mdx b/docs/pages/product/apis-integrations/graphql-api/reference.mdx
similarity index 99%
rename from docs/pages/reference/graphql-api.mdx
rename to docs/pages/product/apis-integrations/graphql-api/reference.mdx
index b2bb09efa3..8c138428ac 100644
--- a/docs/pages/reference/graphql-api.mdx
+++ b/docs/pages/product/apis-integrations/graphql-api/reference.mdx
@@ -1,8 +1,3 @@
----
-redirect_from:
-  - /backend/graphql
----
-
 # GraphQL API reference
 
 [GraphQL API][ref-graphql-api] supports the following requests and parameters.
diff --git a/docs/pages/product/apis-integrations/javascript-sdk.mdx b/docs/pages/product/apis-integrations/javascript-sdk.mdx
index 974d613a28..fddfbde840 100644
--- a/docs/pages/product/apis-integrations/javascript-sdk.mdx
+++ b/docs/pages/product/apis-integrations/javascript-sdk.mdx
@@ -8,8 +8,8 @@ redirect_from:
 Cube is visualization-agnostic, so you can build any user interface for your
 application.
 
-You can directly query Cube Backend using
-JSON [Query Format](/product/apis-integrations/rest-api/query-format) via [HTTP API](/reference/rest-api)
+You can directly query Cube using the
+JSON [query format](/product/apis-integrations/rest-api/query-format) via the [REST API](/product/apis-integrations/rest-api/reference)
 or
 [WebSockets](/product/apis-integrations/rest-api/real-time-data-fetch#web-sockets)
 and visualize analytical data with tools of your choice. However, it's much
@@ -25,25 +25,25 @@ Chart.js, D3.js, and more.
 The client provides methods to solve common tasks:
 
 **Abstract from the transport and query data.** You can
-[fetch data](/reference/frontend/cubejs-client-core#load) from Cube Backend or
+[fetch data](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#load) from Cube Backend or
 subscribe to
 [real-time updates](/product/apis-integrations/rest-api/real-time-data-fetch)
 regardless of the protocol, be it HTTP or WebSockets.
 
 **Transform data for visualization.** You can
-[pivot](/reference/frontend/cubejs-client-core#pivot) the result set to display
-as a [chart](/reference/frontend/cubejs-client-core#chart-pivot) or as a
-[table](/reference/frontend/cubejs-client-core#table-pivot), split into
-[series](/reference/frontend/cubejs-client-core#series) or
-[table columns](/reference/frontend/cubejs-client-core#table-columns).
+[pivot](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#pivot) the result set to display
+as a [chart](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#chartpivot) or as a
+[table](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#tablepivot), split into
+[series](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#series) or
+[table columns](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#tablecolumns).
 
 **Simplify work with complex query types.** You can build
-[Drill Down](/reference/frontend/cubejs-client-core#drill-down) queries and
-[decompose](/reference/frontend/cubejs-client-core#decompose) the results of
+[drill down](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#drilldown) queries and
+[decompose](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#decompose) the results of
 [compare date range queries][ref-compare-date-range]
-or [Data Blending](/product/data-modeling/concepts/data-blending) queries.
+or [data blending](/product/data-modeling/concepts/data-blending) queries.
 
-[Learn more](/reference/frontend/cubejs-client-core) in the documentation for
+[Learn more](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core) in the documentation for
 the `@cubejs-client/core` package.
 
 ## Example Usage
@@ -129,4 +129,4 @@ console.log(resultSet.tablePivot())
 [ref-rest-api]: /product/apis-integrations/rest-api
 [link-max-safe-int]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/MAX_SAFE_INTEGER
 [ref-data-sources]: /product/configuration/data-sources
-[ref-ref-loadmethodoptions]: /reference/frontend/cubejs-client-core#loadmethodoptions
\ No newline at end of file
+[ref-ref-loadmethodoptions]: /product/apis-integrations/javascript-sdk/reference/cubejs-client-core#loadmethodoptions
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/javascript-sdk/_meta.js b/docs/pages/product/apis-integrations/javascript-sdk/_meta.js
index a29bb90c85..59bdb8267f 100644
--- a/docs/pages/product/apis-integrations/javascript-sdk/_meta.js
+++ b/docs/pages/product/apis-integrations/javascript-sdk/_meta.js
@@ -1,5 +1,6 @@
 module.exports = {
   "react": "React",
   "vue": "Vue",
-  "angular": "Angular"
+  "angular": "Angular",
+  "reference": "Reference"
 }
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/javascript-sdk/angular.mdx b/docs/pages/product/apis-integrations/javascript-sdk/angular.mdx
index 058e53ad43..b8ebfcc7ff 100644
--- a/docs/pages/product/apis-integrations/javascript-sdk/angular.mdx
+++ b/docs/pages/product/apis-integrations/javascript-sdk/angular.mdx
@@ -8,8 +8,8 @@ redirect_from:
 Cube is visualization-agnostic, so you can build any user interface for your
 application.
 
-You can directly query Cube Backend using
-JSON [Query Format](/product/apis-integrations/rest-api/query-format) via [HTTP API](/reference/rest-api)
+You can directly query Cube using the
+JSON [query format](/product/apis-integrations/rest-api/query-format) via the [REST API](/product/apis-integrations/rest-api/reference)
 or
 [WebSockets](/product/apis-integrations/rest-api/real-time-data-fetch#web-sockets)
 and visualize analytical data with tools of your choice. However, it’s much
@@ -25,37 +25,35 @@ including Chart.js, D3.js, and more.
 The client provides methods to solve common tasks:
 
 **Abstract from the transport and query data.** You can
-[fetch data](/reference/frontend/cubejs-client-core#load) from Cube Backend or
+[fetch data](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#load) from Cube Backend or
 subscribe to
 [real-time updates](/product/apis-integrations/rest-api/real-time-data-fetch)
 regardless of the protocol, be it HTTP or WebSockets.
 
 **Transform data for visualization.** You can
-[pivot](/reference/frontend/cubejs-client-core#pivot) the result set to display
-as a [chart](/reference/frontend/cubejs-client-core#chart-pivot) or as a
-[table](/reference/frontend/cubejs-client-core#table-pivot), split into
-[series](/reference/frontend/cubejs-client-core#series) or
-[table columns](/reference/frontend/cubejs-client-core#table-columns).
+[pivot](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#pivot) the result set to display
+as a [chart](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#chartpivot) or as a
+[table](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#tablepivot), split into
+[series](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#series) or
+[table columns](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#tablecolumns).
 
 **Simplify work with complex query types.** You can build
-[Drill Down](/reference/frontend/cubejs-client-core#drill-down) queries and
-[decompose](/reference/frontend/cubejs-client-core#decompose) the results of
+[drill down](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#drilldown) queries and
+[decompose](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#decompose) the results of
 [compare date range queries][ref-compare-date-range]
-or [Data Blending](/product/data-modeling/concepts/data-blending) queries.
+or [data blending](/product/data-modeling/concepts/data-blending) queries.
 
-[Learn more](/reference/frontend/cubejs-client-core) in the documentation for
+[Learn more](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core) in the documentation for
 the `@cubejs-client/core` package.
 
 ## Cube Angular Package
 
 The package provides convenient tools to work with Cube in Angular:
 
-**Modules.** Inject
-[CubeClientModule](/reference/frontend/cubejs-client-vue#query-builder) and
-[CubeClient](/reference/frontend/cubejs-client-vue#query-renderer) into your
+**Modules.** Inject [`CubeClientModule` and `CubeClient`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-ngx#api) into your
 components and services to get access to `@cubejs-client/core` API.
 
-**Subjects.** Use [RxJS Subject](/reference/frontend/cubejs-client-ngx#api) and
+**Subjects.** Use [RxJS Subject](/product/apis-integrations/javascript-sdk/reference/cubejs-client-ngx#api) and
 query to watch changes.
 
 ## Example Usage
@@ -70,7 +68,7 @@ Here are the typical steps to query and visualize analytical data in Angular:
   The client is also initialized with an [API token](/product/auth), but it
   takes effect only in [production](/product/deployment/production-checklist).
 - **Query data from Cube Backend and Transform data for visualization.** Use
-  [CubeClient](/reference/frontend/cubejs-client-ngx#api) to load data. The
+  [`CubeClient`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-ngx#api) to load data. The
   client accepts a query, which is a plain JavaScript object. See
   [Query Format](/product/apis-integrations/rest-api/query-format) for details.
 - **Visualize the data.** Use tools of your choice to draw charts and create
diff --git a/docs/pages/product/apis-integrations/javascript-sdk/react.mdx b/docs/pages/product/apis-integrations/javascript-sdk/react.mdx
index 1e1c7bddda..a7d0f3e845 100644
--- a/docs/pages/product/apis-integrations/javascript-sdk/react.mdx
+++ b/docs/pages/product/apis-integrations/javascript-sdk/react.mdx
@@ -8,8 +8,8 @@ redirect_from:
 Cube is visualization-agnostic, so you can build any user interface for your
 application.
 
-You can directly query Cube Backend using
-JSON [Query Format](/product/apis-integrations/rest-api/query-format) via [HTTP API](/reference/rest-api)
+You can directly query Cube using the
+JSON [query format](/product/apis-integrations/rest-api/query-format) via the [REST API](/product/apis-integrations/rest-api/reference)
 or
 [WebSockets](/product/apis-integrations/rest-api/real-time-data-fetch#web-sockets)
 and visualize analytical data with tools of your choice. However, it's much
@@ -25,25 +25,25 @@ Chart.js, D3.js, and more.
 The client provides methods to solve common tasks:
 
 **Abstract from the transport and query data.** You can
-[fetch data](/reference/frontend/cubejs-client-core#load) from Cube Backend or
+[fetch data](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#load) from Cube Backend or
 subscribe to
 [real-time updates](/product/apis-integrations/rest-api/real-time-data-fetch)
 regardless of the protocol, be it HTTP or WebSockets.
 
 **Transform data for visualization.** You can
-[pivot](/reference/frontend/cubejs-client-core#pivot) the result set to display
-as a [chart](/reference/frontend/cubejs-client-core#chart-pivot) or as a
-[table](/reference/frontend/cubejs-client-core#table-pivot), split into
-[series](/reference/frontend/cubejs-client-core#series) or
-[table columns](/reference/frontend/cubejs-client-core#table-columns).
+[pivot](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#pivot) the result set to display
+as a [chart](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#chartpivot) or as a
+[table](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#tablepivot), split into
+[series](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#series) or
+[table columns](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#tablecolumns).
 
 **Simplify work with complex query types.** You can build
-[Drill Down](/reference/frontend/cubejs-client-core#drill-down) queries and
-[decompose](/reference/frontend/cubejs-client-core#decompose) the results of
+[drill down](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#drilldown) queries and
+[decompose](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#decompose) the results of
 [compare date range queries][ref-compare-date-range]
-or [Data Blending](/product/data-modeling/concepts/data-blending) queries.
+or [data blending](/product/data-modeling/concepts/data-blending) queries.
 
-[Learn more](/reference/frontend/cubejs-client-core) in the documentation for
+[Learn more](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core) in the documentation for
 the `@cubejs-client/core` package.
 
 ## Cube React Package
@@ -51,17 +51,17 @@ the `@cubejs-client/core` package.
 The package provides convenient tools to work with Cube in React:
 
 **Hooks.** You can add the
-[useCubeQuery hook](/reference/frontend/cubejs-client-react#use-cube-query) to
+[useCubeQuery hook](/product/apis-integrations/javascript-sdk/reference/cubejs-client-react#usecubequery) to
 functional React components to execute Cube queries.
 
 **Components.** You can use
-[QueryBuilder](/reference/frontend/cubejs-client-react#query-builder) and
-[QueryRenderer](/reference/frontend/cubejs-client-react#query-renderer)
+[`QueryBuilder`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-react#querybuilder) and
+[`QueryRenderer`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-react#queryrenderer)
 components to separate state management and API calls from your rendering code.
 You can also use
-[CubeProvider](/reference/frontend/cubejs-client-react#cube-provider) and
-[CubeContext](/reference/frontend/cubejs-client-react#cube-context) components
-for direct access to Cube Client anywhere in your application.
+[`CubeProvider`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-react#cubeprovider) and
+[`CubeContext`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-react#cubecontext) components
+for direct access to Cube client anywhere in your application.
 
 ## Example Usage
 
diff --git a/docs/pages/reference/frontend/_meta.js b/docs/pages/product/apis-integrations/javascript-sdk/reference/_meta.js
similarity index 100%
rename from docs/pages/reference/frontend/_meta.js
rename to docs/pages/product/apis-integrations/javascript-sdk/reference/_meta.js
diff --git a/docs/pages/reference/frontend/cubejs-client-core.mdx b/docs/pages/product/apis-integrations/javascript-sdk/reference/cubejs-client-core.mdx
similarity index 100%
rename from docs/pages/reference/frontend/cubejs-client-core.mdx
rename to docs/pages/product/apis-integrations/javascript-sdk/reference/cubejs-client-core.mdx
diff --git a/docs/pages/reference/frontend/cubejs-client-ngx.mdx b/docs/pages/product/apis-integrations/javascript-sdk/reference/cubejs-client-ngx.mdx
similarity index 86%
rename from docs/pages/reference/frontend/cubejs-client-ngx.mdx
rename to docs/pages/product/apis-integrations/javascript-sdk/reference/cubejs-client-ngx.mdx
index 528eeaa31c..a4bb3c64c2 100644
--- a/docs/pages/reference/frontend/cubejs-client-ngx.mdx
+++ b/docs/pages/product/apis-integrations/javascript-sdk/reference/cubejs-client-ngx.mdx
@@ -39,7 +39,7 @@ export class AppModule { }
 ```
 
 The `options` object is passed directly to
-[@cubejs-client/core](/reference/frontend/cubejs-client-core).
+[`@cubejs-client/core`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core).
 
 `CubeClientModule` provides `CubeClient`, which you can inject into your
 components or services:
@@ -68,10 +68,10 @@ export class AppComponent {
 ## API
 
 `CubeClient` provides the same API methods as
-[@cubejs-client/core](/reference/frontend/cubejs-client-core#cubeapi). The
+[`@cubejs-client/core`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#cubeapi). The
 difference is that instead of Promise it returns an
 [Observable](http://reactivex.io/rxjs/class/es6/Observable.js~Observable.html),
-which passes [resultSet](/reference/frontend/cubejs-client-core#resultset) into
+which passes [`resultSet`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#resultset) into the
 callback function.
 
 Also you can use [RxJS Subject](https://rxjs-dev.firebaseapp.com/guide/subject)
diff --git a/docs/pages/reference/frontend/cubejs-client-react.mdx b/docs/pages/product/apis-integrations/javascript-sdk/reference/cubejs-client-react.mdx
similarity index 98%
rename from docs/pages/reference/frontend/cubejs-client-react.mdx
rename to docs/pages/product/apis-integrations/javascript-sdk/reference/cubejs-client-react.mdx
index db31988a47..c37d5b0250 100644
--- a/docs/pages/reference/frontend/cubejs-client-react.mdx
+++ b/docs/pages/product/apis-integrations/javascript-sdk/reference/cubejs-client-react.mdx
@@ -4,7 +4,7 @@
 
 ## `useCubeQuery`
 
->  **useCubeQuery**‹**TData**›(**query**: Query | Query[], **options?**: [UseCubeQueryOptions](#use-cube-query-options)): *[UseCubeQueryResult](#use-cube-query-result)‹Query, TData›*
+>  **useCubeQuery**‹**TData**›(**query**: Query | Query[], **options?**: [UseCubeQueryOptions](#usecubequeryoptions)): *[UseCubeQueryResult](#usecubequeryresulttquery-tdata)‹Query, TData›*
 
 A React hook for executing Cube queries
 ```js
diff --git a/docs/pages/reference/frontend/cubejs-client-vue.mdx b/docs/pages/product/apis-integrations/javascript-sdk/reference/cubejs-client-vue.mdx
similarity index 91%
rename from docs/pages/reference/frontend/cubejs-client-vue.mdx
rename to docs/pages/product/apis-integrations/javascript-sdk/reference/cubejs-client-vue.mdx
index 3dbb695b50..71db68cf41 100644
--- a/docs/pages/reference/frontend/cubejs-client-vue.mdx
+++ b/docs/pages/product/apis-integrations/javascript-sdk/reference/cubejs-client-vue.mdx
@@ -13,7 +13,7 @@ props technique.
 
 | Name                   | Type                                                                                                                                          | Description                                                                                                                                                                                                                        |
 | ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| cubeApi                | [CubeApi](/reference/frontend/cubejs-client-core#cubeapi)                                                                                     | `CubeApi` instance to use                                                                                                                                                                                                          |
+| cubeApi                | [`CubeApi`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#cubeapi)                                                                                     | `CubeApi` instance to use                                                                                                                                                                                                          |
 | initialChartType?      | [ChartType](#types-chart-type)                                                                                                                | The type of chart to display initially. Default is `line`.                                                                                                                                                                         |
 | disableHeuristics?     | boolean                                                                                                                                       | Defaults to `false`. This means that the default heuristics will be applied. For example: when the query is empty and you select a measure that has a default time dimension it will be pushed to the query.                       |
 | query?                 | Query                                                                                                                                         | Query parameters ([learn more about the format](/product/apis-integrations/rest-api/query-format)). This property is reactive - if you change the object here, the internal query values will be overwritten. This is not two-way. |
@@ -28,7 +28,7 @@ props technique.
 ##### Slot Props
 
 - `resultSet`: A `resultSet` is an object containing data obtained from the
-  query. [ResultSet](/reference/frontend/cubejs-client-core#result-set) object
+  query. [`ResultSet`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#resultset) object
   provides a convenient interface for data manipulation.
 
 #### Empty Slot
@@ -165,7 +165,7 @@ uses the slot scoped props to render the resulting data.
 | Name     | Type                  | Description                                                                                                                                                                                                                                                                                                                                         |
 | -------- | --------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | cubeApi  | CubeApi               | `CubeApi` instance to use                                                                                                                                                                                                                                                                                                                           |
-| loadSql? | "only" &#124; boolean | Indicates whether the generated by Cube SQL Code should be requested. See [rest-api#sql](/reference/rest-api#v1sql). When set to `only` then only the request to [/v1/sql](/reference/rest-api#v1sql) will be performed. When set to `true` the sql request will be performed along with the query request. Will not be performed if set to `false` |
+| loadSql? | "only" &#124; boolean | Indicates whether the generated by Cube SQL Code should be requested. See [rest-api#sql](/product/apis-integrations/rest-api/reference#v1sql). When set to `only` then only the request to [/v1/sql](/product/apis-integrations/rest-api/reference#v1sql) will be performed. When set to `true` the sql request will be performed along with the query request. Will not be performed if set to `false` |
 | queries? | object                | -                                                                                                                                                                                                                                                                                                                                                   |
 | query    | Query                 | Analytic query. [Learn more about it's format](/product/apis-integrations/rest-api/query-format)                                                                                                                                                                                                                                                    |
 
@@ -176,7 +176,7 @@ uses the slot scoped props to render the resulting data.
 ##### Slot Props
 
 - `resultSet`: A `resultSet` is an object containing data obtained from the
-  query. [ResultSet](/reference/frontend/cubejs-client-core#result-set) object
+  query. [`ResultSet`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#resultset) object
   provides a convenient interface for data manipulation.
 
 #### Empty Slot
@@ -266,7 +266,7 @@ rendering.
 
 | Name       | Type                                                  |
 | ---------- | ----------------------------------------------------- |
-| query      | [Query](/reference/frontend/cubejs-client-core#query) |
+| query      | [`Query`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#query-1) |
 | chartType? | [ChartType](#types-chart-type)                        |
 
 ### VizState
@@ -274,5 +274,5 @@ rendering.
 | Name                       | Type                                                               |
 | -------------------------- | ------------------------------------------------------------------ |
 | chartType?                 | [ChartType](#types-chart-type)                                     |
-| pivotConfig?               | [PivotConfig](/reference/frontend/cubejs-client-core#pivot-config) |
+| pivotConfig?               | [`PivotConfig`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#pivotconfig) |
 | shouldApplyHeuristicOrder? | boolean                                                            |
diff --git a/docs/pages/reference/frontend/cubejs-client-ws-transport.mdx b/docs/pages/product/apis-integrations/javascript-sdk/reference/cubejs-client-ws-transport.mdx
similarity index 100%
rename from docs/pages/reference/frontend/cubejs-client-ws-transport.mdx
rename to docs/pages/product/apis-integrations/javascript-sdk/reference/cubejs-client-ws-transport.mdx
diff --git a/docs/pages/product/apis-integrations/javascript-sdk/vue.mdx b/docs/pages/product/apis-integrations/javascript-sdk/vue.mdx
index 76d3b27b67..ca381f7460 100644
--- a/docs/pages/product/apis-integrations/javascript-sdk/vue.mdx
+++ b/docs/pages/product/apis-integrations/javascript-sdk/vue.mdx
@@ -8,8 +8,8 @@ redirect_from:
 Cube is visualization-agnostic, so you can build any user interface for your
 application.
 
-You can directly query Cube Backend using
-JSON [Query Format](/product/apis-integrations/rest-api/query-format) via [HTTP API](/reference/rest-api)
+You can directly query Cube using the
+JSON [query format](/product/apis-integrations/rest-api/query-format) via the [REST API](/product/apis-integrations/rest-api/reference)
 or
 [WebSockets](/product/apis-integrations/rest-api/real-time-data-fetch#web-sockets)
 and visualize analytical data with tools of your choice. However, it's much
@@ -25,25 +25,25 @@ Chart.js, D3.js, and more.
 The client provides methods to solve common tasks:
 
 **Abstract from the transport and query data.** You can
-[fetch data](/reference/frontend/cubejs-client-core#load) from Cube Backend or
+[fetch data](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#load) from Cube Backend or
 subscribe to
 [real-time updates](/product/apis-integrations/rest-api/real-time-data-fetch)
 regardless of the protocol, be it HTTP or WebSockets.
 
 **Transform data for visualization.** You can
-[pivot](/reference/frontend/cubejs-client-core#pivot) the result set to display
-as a [chart](/reference/frontend/cubejs-client-core#chart-pivot) or as a
-[table](/reference/frontend/cubejs-client-core#table-pivot), split into
-[series](/reference/frontend/cubejs-client-core#series) or
-[table columns](/reference/frontend/cubejs-client-core#table-columns).
+[pivot](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#pivot) the result set to display
+as a [chart](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#chartpivot) or as a
+[table](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#tablepivot), split into
+[series](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#series) or
+[table columns](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#tablecolumns).
 
 **Simplify work with complex query types.** You can build
-[Drill Down](/reference/frontend/cubejs-client-core#drill-down) queries and
-[decompose](/reference/frontend/cubejs-client-core#decompose) the results of
+[drill down](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#drilldown) queries and
+[decompose](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core#decompose) the results of
 [compare date range queries][ref-compare-date-range]
-or [Data Blending](/product/data-modeling/concepts/data-blending) queries.
+or [data blending](/product/data-modeling/concepts/data-blending) queries.
 
-[Learn more](/reference/frontend/cubejs-client-core) in the documentation for
+[Learn more](/product/apis-integrations/javascript-sdk/reference/cubejs-client-core) in the documentation for
 the `@cubejs-client/core` package.
 
 ## Cube Vue Package
@@ -51,8 +51,8 @@ the `@cubejs-client/core` package.
 The package provides convenient tools to work with Cube in Vue:
 
 **Components.** You can use
-[QueryBuilder](/reference/frontend/cubejs-client-vue#query-builder) and
-[QueryRenderer](/reference/frontend/cubejs-client-vue#query-renderer) components
+[`QueryBuilder`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-vue#querybuilder) and
+[`QueryRenderer`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-vue#queryrenderer) components
 to abstract state management and API calls from your rendering code.
 
 ## Example Usage
@@ -67,13 +67,13 @@ Here are the typical steps to query and visualize analytical data in Vue:
   The client is also initialized with an [API token](/product/auth), but it
   takes effect only in [production](/product/deployment/production-checklist).
 - **Query data from Cube Backend.** Use
-  [QueryBuilder](/reference/frontend/cubejs-client-vue#query-builder) or
-  [QueryRenderer](/reference/frontend/cubejs-client-vue#query-renderer) and
+  [`QueryBuilder`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-vue#querybuilder) or
+  [`QueryRenderer`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-vue#queryrenderer) and
   their props to execute a query and transform the result set. See
   [Query Format](/product/apis-integrations/rest-api/query-format) for details.
 - **Transform data for visualization.** Use
-  [QueryBuilder](/reference/frontend/cubejs-client-vue#query-builder) and
-  [QueryRenderer](/reference/frontend/cubejs-client-vue#query-renderer) slots
+  [`QueryBuilder`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-vue#querybuilder) and
+  [`QueryRenderer`](/product/apis-integrations/javascript-sdk/reference/cubejs-client-vue#queryrenderer) slots
   props to transform the result set. Furthermore, the result set has convenient
   methods, such as `series` and `chartPivot`, to prepare data for charting.
 - **Visualize the data.** Use tools of your choice to draw charts and create
diff --git a/docs/pages/product/apis-integrations/mdx-api.mdx b/docs/pages/product/apis-integrations/mdx-api.mdx
index 2e5de9ffd9..3bae888137 100644
--- a/docs/pages/product/apis-integrations/mdx-api.mdx
+++ b/docs/pages/product/apis-integrations/mdx-api.mdx
@@ -1,12 +1,12 @@
 # MDX API
 
-The MDX (MultiDimensional eXpressions) API provides a robust interface for connecting applications, such as Microsoft Excel, to the Cube Cloud semantic layer via the XMLA (XML for Analysis) standard.
+The MDX API enables Cube to connect to [Microsoft Excel][ref-excel]. It derives
+its name from [multidimensional data expressions][link-mdx], a query language
+for OLAP in the Microsoft ecosystem.
 
-Key Features:
-
-- <b>Direct connectivity:</b> Connect Excel directly to Cube Cloud using standard XMLA protocols.
-- <b>Advanced analytical functions:</b> Utilize the power of MDX to execute sophisticated queries that include slicing, dicing, drilling down, and rolling up of data.
-- <b>Real-time access:</b> Fetch live data from Cube Cloud, ensuring that your analyses and reports always reflect the most current information.
+Unlike [Cube Cloud for Excel][ref-cube-cloud-for-excel], it only works with Excel
+on Microsoft Windows. However, it allows using the data from the MDX API with the
+native [PivotTable][link-pivottable] in Excel.
 
 <SuccessBox>
 
@@ -22,22 +22,30 @@ The MDX API is currently in preview.
 
 </WarningBox>
 
+Key features:
+
+- <b>Direct connectivity:</b> Connect Excel directly to Cube Cloud using standard XMLA protocols.
+- <b>Advanced analytical functions:</b> Utilize the power of MDX to execute sophisticated queries that include slicing, dicing, drilling down, and rolling up of data.
+- <b>Real-time access:</b> Fetch live data from Cube Cloud, ensuring that your analyses and reports always reflect the most current information.
+
 ## Configuration
 
+<WarningBox>
+
 While the MDX API is in preview, your Cube account team will enable and configure it for you.
 
-If you wish to enable or disable the MDX API on a specific Cube deployment, you may do so by going to "Settings" in the Cube Cloud sidebar, then "Configuration", and then toggling the "Enable MDX API" configuration flag switch.
+</WarningBox>
 
-To find your MDX API credentials and the XMLA endpoint in Cube Cloud, go to the
-<Btn>Overview</Btn> page, click <Btn>API credentials</Btn>, and choose the
-<Btn>AI API</Btn> tab.
+To enable or disable the MDX API on a specific deployment, go to <Btn>Settings</Btn>
+in the Cube Cloud sidebar, then <Btn>Configuration</Btn>, and then toggle the
+<Btn>Enable MDX API</Btn> option.
 
 ## Using MDX API with Excel
 
-Once MDX API is enabled, you can use it to connect to Cube from Excel. In Excel, go to the **Data tab**, click **Get Data** and select **From Database -> From Analysis Services**.
-
 <InfoBox>
-  Please note that only the [views](/reference/data-model/view) will be available for connections via MDX API
+
+The MDX API works only with [views][ref-views], not cubes.
+
 </InfoBox>
 
 The following section describes Excel-specific configuration options.
@@ -164,5 +172,10 @@ This is going to be harmonized in the future.
 Authentication and authorization work the same as for the [SQL API](/product/apis-integrations/sql-api/security).
 
 
+[ref-excel]: /product/configuration/visualization-tools/excel
+[link-mdx]: https://learn.microsoft.com/en-us/analysis-services/multidimensional-models/mdx/multidimensional-model-data-access-analysis-services-multidimensional-data?view=asallproducts-allversions#bkmk_querylang
+[link-pivottable]: https://support.microsoft.com/en-us/office/create-a-pivottable-to-analyze-worksheet-data-a9a84538-bfe9-40a9-a8e9-f99134456576
+[ref-cube-cloud-for-excel]: /product/apis-integrations/microsoft-excel
 [ref-hierarchies]: /reference/data-model/hierarchies
-[ref-folders]: /reference/data-model/view#folders
\ No newline at end of file
+[ref-folders]: /reference/data-model/view#folders
+[ref-views]: /product/data-modeling/concepts#views
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/microsoft-excel.mdx b/docs/pages/product/apis-integrations/microsoft-excel.mdx
new file mode 100644
index 0000000000..70f8b98dca
--- /dev/null
+++ b/docs/pages/product/apis-integrations/microsoft-excel.mdx
@@ -0,0 +1,125 @@
+# Cube Cloud for Excel
+
+Cube Cloud for Excel is the native [Microsoft Excel][ref-excel] add-in for Cube Cloud.
+
+Unlike the [MDX API][ref-mdx-api], it works with Excel on all operating systems,
+including macOS, and all platforms, including web and mobile. It doesn't integrate
+with the native [PivotTable][link-pivottable] in Excel but provides a custom
+[pivot table](#create-reports-via-pivot-table) UI.
+
+<SuccessBox>
+
+Cube Cloud for Excel is available in Cube Cloud on [Enterprise and above](https://cube.dev/pricing) product tiers.
+
+</SuccessBox>
+
+<WarningBox>
+
+Cube Cloud for Excel is currently in preview. Please [contact us](https://cube.dev/contact) to get access to it.
+
+</WarningBox>
+
+After [configuring](#configuration), [installing](#installation), and
+[authenticating](#authentication) this add-in, you will be able to [create
+reports via pivot table](#create-reports-via-pivot-table) and work with
+[saved reports](#work-with-saved-reports).
+
+<YouTubeVideo
+  url="https://www.youtube.com/embed/vG7iEdYTvIQ"
+  aspectRatio={5/4}
+/>
+
+## Configuration
+
+Cube Cloud for Excel uses the SQL API internally. So, the SQL API has to be
+[enabled][ref-sql-api-enabled] in the Cube Cloud deployment settings.
+
+## Installation
+
+<WarningBox>
+
+Please contact the customer success team in Cube Cloud so we can guide you
+through the installation.
+
+</WarningBox>
+
+## Authentication
+
+You need to authenticate Cube Cloud for Excel to retrieve data from Cube Cloud.
+To do so, open the sidebar by clicking on the <Btn>Cube Cloud</Btn> button in
+the <Btn>Home</Btn> ribbon. Then, click <Btn>Sign in</Btn>.
+
+<Screenshot
+  src="https://ucarecdn.com/bdf82477-02d3-4686-9c8f-8d6384c3e7f3/"
+  highlight="inset(25% 0 45% 72.5% round 10px)"
+/>
+
+A modal window with an authentication prompt will appear. Choose the deployments
+that you want to work with in Microsoft Excel and click <Btn>Authorize</Btn>.
+Once you see the `Access Granted` message, close the modal window.
+
+If you want to revoke the authentication, open the add-in menu and click
+<Btn>Sign out</Btn>.
+
+## Create reports via pivot table
+
+To create a report, go to the add-in menu and click <Btn>Create report via pivot
+table</Btn>. Then, select a Cube Cloud deployment from the drop-down. Finally,
+you can start building a query by selecting a view and its members in the UI that
+looks and feels like [Playground][ref-playground].
+
+<InfoBox>
+
+Google Cloud for Excel works only with [views][ref-views], not cubes.
+
+</InfoBox>
+
+Click on members to add them to <Btn>Rows</Btn> and <Btn>Measures</Btn>.
+If needed, drag dimensions from <Btn>Rows</Btn> to <Btn>Columns</Btn>. Click on
+the funnel buttons to add members to <Btn>Filters</Btn>. Click on <Btn>×</Btn> to
+remove members from a query.
+
+<Screenshot
+  src="https://ucarecdn.com/670fda9d-358a-4345-9242-7888d8aaedd8/"
+  highlight="inset(18% 0 2% 72.5% round 10px)"
+/>
+
+Use <Btn>Order</Btn> and <Btn>Filters</Btn> panes below to sort and filter the
+data in the report.
+
+If you'd like to move the report to a new location, click on the desired top-left
+cell and then confirm with the target button under <Btn>Result location</Btn>.
+
+<Screenshot
+  src="https://ucarecdn.com/4c3af7b9-4ef6-4f7f-8d0f-6d579609482e/"
+  highlight="inset(56.5% 0 2% 72.5% round 10px)"
+/>
+
+With every change to your query, Cube Cloud for Excel will update the report on
+the sheet after a slight delay. If you'd like to minimize it, consider
+implementing [pre-aggregations][ref-pre-aggs].
+
+When your report is ready, you can optionally move it to [saved reports](#work-with-saved-reports)
+by clicking <Btn>Save</Btn>.
+
+## Work with saved reports
+
+Go to the add-in menu and click <Btn>View saved reports</Btn> to see a list of
+reports.
+
+Click <Btn>Refresh</Btn> to manually refresh the data in the report's location.
+Click <Btn>Edit</Btn> to chnage the query or the location.
+
+<Screenshot
+  src="https://ucarecdn.com/167abe25-635c-4fa6-b4a2-c090aa533f3c/"
+  highlight="inset(22.5% 0 20% 72.5% round 10px)"
+/>
+
+
+[ref-excel]: /product/configuration/visualization-tools/excel
+[ref-mdx-api]: /product/apis-integrations/mdx-api
+[link-pivottable]: https://support.microsoft.com/en-us/office/create-a-pivottable-to-analyze-worksheet-data-a9a84538-bfe9-40a9-a8e9-f99134456576
+[ref-playground]: /product/workspace/playground
+[ref-views]: /product/data-modeling/concepts#views
+[ref-pre-aggs]: /product/caching/using-pre-aggregations
+[ref-sql-api-enabled]: /product/apis-integrations/sql-api#cube-cloud
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/orchestration-api.mdx b/docs/pages/product/apis-integrations/orchestration-api.mdx
index 77b28c7405..cdc30f69cd 100644
--- a/docs/pages/product/apis-integrations/orchestration-api.mdx
+++ b/docs/pages/product/apis-integrations/orchestration-api.mdx
@@ -88,5 +88,5 @@ Please [track this issue](https://github.com/cube-js/cube/issues/6722).
 [ref-lambda-pre-aggs]: /product/caching/lambda-pre-aggregations
 [ref-rest-api]: /product/apis-integrations/rest-api
 [ref-api-scopes]: /product/apis-integrations/rest-api#configuration-api-scopes
-[ref-ref-jobs-endpoint]: /reference/rest-api#v1pre-aggregationsjobs
+[ref-ref-jobs-endpoint]: /product/apis-integrations/rest-api/reference#v1pre-aggregationsjobs
 [ref-pre-agg-partitions]: /product/caching/using-pre-aggregations#partitioning
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/orchestration-api/airflow.mdx b/docs/pages/product/apis-integrations/orchestration-api/airflow.mdx
index fd48582e8f..9b3167c719 100644
--- a/docs/pages/product/apis-integrations/orchestration-api/airflow.mdx
+++ b/docs/pages/product/apis-integrations/orchestration-api/airflow.mdx
@@ -209,7 +209,7 @@ astro dev start
 [astro-cli-dev-init]: https://docs.astronomer.io/astro/cli/astro-dev-init
 [github-airflow-provider-cube]:
   https://github.com/cube-js/airflow-provider-cube/
-[ref-load-endpoint]: /reference/rest-api#v1load
-[ref-ref-jobs-endpoint]: /reference/rest-api#v1pre-aggregationsjobs
+[ref-load-endpoint]: /product/apis-integrations/rest-api/reference#v1load
+[ref-ref-jobs-endpoint]: /product/apis-integrations/rest-api/reference#v1pre-aggregationsjobs
 [ref-rest-api]: /product/apis-integrations/rest-api
 [ref-orchestration-api]: /product/apis-integrations/orchestration-api
diff --git a/docs/pages/product/apis-integrations/orchestration-api/dagster.mdx b/docs/pages/product/apis-integrations/orchestration-api/dagster.mdx
index 9522a1a174..9ed3bb43a6 100644
--- a/docs/pages/product/apis-integrations/orchestration-api/dagster.mdx
+++ b/docs/pages/product/apis-integrations/orchestration-api/dagster.mdx
@@ -135,7 +135,7 @@ run both jobs:
 [github-dagster-cube]: https://github.com/discursus-data/dagster-cube
 [github-dagster-cube-docs]:
   https://github.com/discursus-data/dagster-cube/blob/main/README.md
-[ref-load-endpoint]: /reference/rest-api#v1load
-[ref-ref-jobs-endpoint]: /reference/rest-api#v1pre-aggregationsjobs
+[ref-load-endpoint]: /product/apis-integrations/rest-api/reference#v1load
+[ref-ref-jobs-endpoint]: /product/apis-integrations/rest-api/reference#v1pre-aggregationsjobs
 [ref-rest-api]: /product/apis-integrations/rest-api
 [ref-orchestration-api]: /product/apis-integrations/orchestration-api
diff --git a/docs/pages/product/apis-integrations/orchestration-api/prefect.mdx b/docs/pages/product/apis-integrations/orchestration-api/prefect.mdx
index 8ed5727c3f..94af8bea07 100644
--- a/docs/pages/product/apis-integrations/orchestration-api/prefect.mdx
+++ b/docs/pages/product/apis-integrations/orchestration-api/prefect.mdx
@@ -131,7 +131,7 @@ python cube_build.py
 [github-prefect-cubejs]: https://github.com/AlessandroLollo/prefect-cubejs
 [github-prefect-cubejs-docs]:
   https://alessandrolollo.github.io/prefect-cubejs/tasks/
-[ref-load-endpoint]: /reference/rest-api#v1load
-[ref-ref-jobs-endpoint]: /reference/rest-api#v1pre-aggregationsjobs
+[ref-load-endpoint]: /product/apis-integrations/rest-api/reference#v1load
+[ref-ref-jobs-endpoint]: /product/apis-integrations/rest-api/reference#v1pre-aggregationsjobs
 [ref-rest-api]: /product/apis-integrations/rest-api
 [ref-orchestration-api]: /product/apis-integrations/orchestration-api
diff --git a/docs/pages/product/apis-integrations/queries.mdx b/docs/pages/product/apis-integrations/queries.mdx
index 5b05e3d0ae..17ae53d60e 100644
--- a/docs/pages/product/apis-integrations/queries.mdx
+++ b/docs/pages/product/apis-integrations/queries.mdx
@@ -382,12 +382,12 @@ Additionally, note that ungrouped queries have additional requirements for
 [ref-sql-api-qpp]: /product/apis-integrations/sql-api/query-format#query-post-processing
 [ref-sql-api-qpd]: /product/apis-integrations/sql-api/query-format#query-pushdown
 [ref-rest-api]: /product/apis-integrations/rest-api
-[ref-rest-api-load]: /reference/rest-api#v1load
+[ref-rest-api-load]: /product/apis-integrations/rest-api/reference#v1load
 [ref-graphql-api]: /product/apis-integrations/graphql-api
 [ref-data-sources]: /product/configuration/data-sources
 [ref-rest-api-query-format-options]: /product/apis-integrations/rest-api/query-format#query-properties
 [ref-rest-api-query-format-options-tdf]: /product/apis-integrations/rest-api/query-format#time-dimensions-format
-[ref-ref-graphql-api-args]: /reference/graphql-api#cubequeryargs
+[ref-ref-graphql-api-args]: /product/apis-integrations/graphql-api/reference#cubequeryargs
 [ref-sql-utils]: /reference/data-model/context-variables#sql_utils
 [ref-matching-preaggs-time-dimensions]: /product/caching/matching-pre-aggregations#matching-time-dimensions
 [ref-matching-preaggs-ungrouped]: /product/caching/matching-pre-aggregations#matching-ungrouped-queries
@@ -396,6 +396,6 @@ Additionally, note that ungrouped queries have additional requirements for
 [ref-conf-allow-ungrouped]: /reference/configuration/config#allow_ungrouped_without_primary_key
 [ref-caching]: /product/caching
 [ref-query-rewrite]: /reference/configuration/config#query_rewrite
-[ref-ref-sql-api]: /reference/sql-api
+[ref-ref-sql-api]: /product/apis-integrations/sql-api/reference
 [blog-compare-date-range]: https://cube.dev/blog/comparing-data-over-different-time-periods
 [ref-sql-api-streaming]: /product/apis-integrations/sql-api#streaming
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/rest-api.mdx b/docs/pages/product/apis-integrations/rest-api.mdx
index 5d6a00a709..bd9a544882 100644
--- a/docs/pages/product/apis-integrations/rest-api.mdx
+++ b/docs/pages/product/apis-integrations/rest-api.mdx
@@ -269,7 +269,7 @@ example, the following query will retrieve rows 101-200 from the `Orders` cube:
 [ref-config-queryrewrite]: /reference/configuration/config#queryrewrite
 [ref-conf-queue-opts]: /reference/configuration/config#queueoptions
 [ref-rest-query-format]: /product/apis-integrations/rest-api/query-format#query-properties
-[ref-ref-meta-endpoint]: /reference/rest-api#v1meta
+[ref-ref-meta-endpoint]: /product/apis-integrations/rest-api/reference#v1meta
 [ref-config-cors]: /reference/configuration/config#http
 [ref-schema-ref-cube-refresh-key]:
   /reference/data-model/cube#refresh_key
@@ -282,10 +282,10 @@ example, the following query will retrieve rows 101-200 from the `Orders` cube:
 [ref-conf-basepath]: /reference/configuration/config#basepath
 [ref-conf-contexttoapiscopes]:
   /reference/configuration/config#contexttoapiscopes
-[ref-ref-load]: /reference/rest-api#v1load
-[ref-ref-meta]: /reference/rest-api#v1meta
-[ref-ref-sql]: /reference/rest-api#v1sql
-[ref-ref-paj]: /reference/rest-api#v1pre-aggregationsjobs
+[ref-ref-load]: /product/apis-integrations/rest-api/reference#v1load
+[ref-ref-meta]: /product/apis-integrations/rest-api/reference#v1meta
+[ref-ref-sql]: /product/apis-integrations/rest-api/reference#v1sql
+[ref-ref-paj]: /product/apis-integrations/rest-api/reference#v1pre-aggregationsjobs
 [ref-security-context]: /product/auth/context
 [ref-graphql-api]: /product/apis-integrations/graphql-api
 [ref-orchestration-api]: /product/apis-integrations/orchestration-api
@@ -294,6 +294,6 @@ example, the following query will retrieve rows 101-200 from the `Orders` cube:
 [graphql]: https://graphql.org
 [self-api-scopes]: #configuration-api-scopes
 [self-cors]: #configuration-cors
-[ref-ref-rest-api]: /reference/rest-api
+[ref-ref-rest-api]: /product/apis-integrations/rest-api/reference
 [link-jq-utility]: https://jqlang.github.io/jq/
 [gh-cube-openspec]: https://github.com/cube-js/cube/blob/master/packages/cubejs-api-gateway/openspec.yml
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/rest-api/_meta.js b/docs/pages/product/apis-integrations/rest-api/_meta.js
index 441fb7eda6..29304b8354 100644
--- a/docs/pages/product/apis-integrations/rest-api/_meta.js
+++ b/docs/pages/product/apis-integrations/rest-api/_meta.js
@@ -1,4 +1,5 @@
 module.exports = {
   "query-format": "Query format",
-  "real-time-data-fetch": "Real-Time data fetch"
+  "real-time-data-fetch": "Real-Time data fetch",
+  "reference": "Reference"
 }
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/rest-api/query-format.mdx b/docs/pages/product/apis-integrations/rest-api/query-format.mdx
index b592d9ae5f..44b314b96e 100644
--- a/docs/pages/product/apis-integrations/rest-api/query-format.mdx
+++ b/docs/pages/product/apis-integrations/rest-api/query-format.mdx
@@ -616,8 +616,7 @@ refer to its documentation for more examples.
 
 </InfoBox>
 
-[ref-client-core-resultset-drilldown]:
-  /reference/frontend/cubejs-client-core#result-set-drill-down
+[ref-client-core-resultset-drilldown]: /product/apis-integrations/javascript-sdk/reference/cubejs-client-core#drilldown
 [ref-schema-ref-preaggs-refreshkey]:
   /reference/data-model/pre-aggregations#refresh_key
 [ref-schema-ref-preaggs-refreshkey-every]:
diff --git a/docs/pages/reference/rest-api.mdx b/docs/pages/product/apis-integrations/rest-api/reference.mdx
similarity index 93%
rename from docs/pages/reference/rest-api.mdx
rename to docs/pages/product/apis-integrations/rest-api/reference.mdx
index d3ae384eb3..9cf58e8ac7 100644
--- a/docs/pages/reference/rest-api.mdx
+++ b/docs/pages/product/apis-integrations/rest-api/reference.mdx
@@ -5,9 +5,16 @@ redirect_from:
 
 # REST API reference
 
-[REST API][ref-rest-api] provides the following endpoints.
+The [REST API][ref-rest-api] provides the following endpoints.
 
-## `/v1/load`
+<InfoBox>
+
+The `{base_path}` part of the endpoint URLs can be [configured][ref-basepath].
+By default, it's `/cubejs-api`.
+
+</InfoBox>
+
+## `{base_path}/v1/load`
 
 Get the data for a query.
 
@@ -90,7 +97,7 @@ values.
 
 </WarningBox>
 
-## `/v1/sql`
+## `{base_path}/v1/sql`
 
 Get the SQL Code generated by Cube to be executed in the database.
 
@@ -152,7 +159,7 @@ that Cube passes to an underlying data source driver later when executing the qu
 
 </InfoBox>
 
-## `/v1/meta`
+## `{base_path}/v1/meta`
 
 Get meta-information for cubes and views defined in the data model. Information about cubes and views with `public: false` will not be returned.
 
@@ -165,7 +172,9 @@ Response
   - `meta` - Custom metadata
   - `measures` - Array of measures in this cube/view
   - `dimensions` - Array of dimensions in this cube/view
+  - `hierarchies` - Array of hierarchies in this cube
   - `segments` - Array of segments in this cube/view
+  - `folders` - Array of folders in this view
   - `connectedComponent` - An integer representing a join relationship. If the same value is returned for two cubes, then there is
     at least one join path between them.
 
@@ -220,7 +229,7 @@ Example response:
 }
 ```
 
-## `/v1/pre-aggregations/jobs`
+## `{base_path}/v1/pre-aggregations/jobs`
 
 Trigger pre-aggregation build jobs or retrieve statuses of such jobs.
 
@@ -376,13 +385,8 @@ Example response:
 
 ## `/readyz`
 
-Returns the ready state of the deployment.
-
-**Single-tenant:** Ensures the orchestration layer is operational and tests the
-connection to the default `dataSource`.
-
-**Multi-tenant:** Tests connections per-tenant. If no connections exist, it will
-report as successful.
+Reports if the deployment has successfully started. To do so, it will try to test
+the connection to the _default_ [data source][ref-datasources].
 
 Example of a successful request:
 
@@ -420,9 +424,8 @@ Keep-Alive: timeout=5
 
 ## `/livez`
 
-Returns the liveness state of the deployment. This is confirmed by testing any
-existing connections to `dataSource`. If no connections exist, it will report as
-successful.
+Reports if the deployment is still healthy. This is confirmed by testing any
+existing connections to data sources.
 
 Example of a successful response:
 
@@ -458,6 +461,7 @@ Keep-Alive: timeout=5
 {"health":"DOWN"}
 ```
 
-[ref-recipes-data-blending]:
-  /product/data-modeling/concepts/data-blending#data-blending
+[ref-recipes-data-blending]: /product/data-modeling/concepts/data-blending#data-blending
 [ref-rest-api]: /product/apis-integrations/rest-api
+[ref-basepath]: /product/apis-integrations/rest-api#base-path
+[ref-datasources]: /product/configuration/advanced/multiple-data-sources
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/semantic-layer-sync.mdx b/docs/pages/product/apis-integrations/semantic-layer-sync.mdx
index a25622423d..a28479fe9a 100644
--- a/docs/pages/product/apis-integrations/semantic-layer-sync.mdx
+++ b/docs/pages/product/apis-integrations/semantic-layer-sync.mdx
@@ -7,7 +7,7 @@ layer from Cube to BI tools. It's the easiest way to connect a BI tool to Cube.
 
 Semantic Layer Sync is available in Cube Cloud.
 <br/>Support for Metabase, Preset, and Superset is available on [all product tiers](https://cube.dev/pricing).
-<br/>Support for Tableau and Power BI is available on [Enterprise and above](https://cube.dev/pricing) product tiers.
+<br/>Support for Tableau is available on [Enterprise and above](https://cube.dev/pricing) product tiers.
 
 </SuccessBox>
 
@@ -42,11 +42,6 @@ on configuration and features for specific tools:
     imageUrl="https://static.cube.dev/icons/metabase.svg"
     title="Metabase"
   />
-  <GridItem
-    url="semantic-layer-sync/power-bi"
-    imageUrl="https://static.cube.dev/icons/powerbi.svg"
-    title="Microsoft Power BI"
-  />
   <GridItem
     url="semantic-layer-sync/preset"
     imageUrl="https://static.cube.dev/icons/preset.svg"
@@ -59,6 +54,13 @@ on configuration and features for specific tools:
   />
 </Grid>
 
+<InfoBox>
+
+Previously, Semantic Layer Sync provided a way to connect to [Microsoft Power BI][ref-powerbi].
+Currently, it's recommended to use the [DAX API][ref-dax-api].
+
+</InfoBox>
+
 ## Creating syncs
 
 You can create a new sync by navigating to the <Btn>Semantic Layer Sync</Btn>
@@ -396,10 +398,12 @@ on, i.e., your development mode branch, shared branch, or main branch.
 
 [ref-data-model]: /product/data-modeling/overview
 [ref-sql-api]: /product/apis-integrations/sql-api
+[ref-powerbi]: /product/configuration/visualization-tools/powerbi
+[ref-dax-api]: /product/apis-integrations/dax-api
 [ref-config-file]: /product/configuration#configuration-options
 [ref-config-sls]: /reference/configuration/config#semanticlayersync
 [ref-config-contexts]: /reference/configuration/config#scheduledrefreshcontexts
 [ref-config-schemaversion]: /reference/configuration/config#schema_version
 [ref-workspace-sls]: /workspace/bi-integrations
 [ref-dev-mode]: /product/workspace/dev-mode
-[ref-auto-sus]: /product/deployment/cloud/auto-suspension
+[ref-auto-sus]: /product/deployment/cloud/auto-suspension
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/semantic-layer-sync/_meta.js b/docs/pages/product/apis-integrations/semantic-layer-sync/_meta.js
index 09dd4df00b..2440b6e1d2 100644
--- a/docs/pages/product/apis-integrations/semantic-layer-sync/_meta.js
+++ b/docs/pages/product/apis-integrations/semantic-layer-sync/_meta.js
@@ -1,7 +1,6 @@
 module.exports = {
   "superset": "Apache Superset",
-  "metabase": "Metabase",
-  "power-bi": "Power BI",
+  "metabase": "Metabase",≈
   "preset": "Preset",
   "tableau": "Tableau"
 }
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/semantic-layer-sync/power-bi.mdx b/docs/pages/product/apis-integrations/semantic-layer-sync/power-bi.mdx
deleted file mode 100644
index ddb159e63b..0000000000
--- a/docs/pages/product/apis-integrations/semantic-layer-sync/power-bi.mdx
+++ /dev/null
@@ -1,34 +0,0 @@
-# Semantic Layer Sync with Power BI
-
-This page details the support for [Power BI](https://www.microsoft.com/en-gb/power-platform/products/power-bi/)
-in [Semantic Layer Sync](/product/apis-integrations/semantic-layer-sync).
-
-<SuccessBox>
-
-Semantic Layer Sync with Power BI is available on
-[Enterprise and above](https://cube.dev/pricing) product tiers.
-
-</SuccessBox>
-
-## Configuration
-
-To create a new sync, choose <Btn>Power BI</Btn>:
-
-<Screenshot
-  highlight="inset(34% 20% 55% 65% round 10px)"
-  src="https://ucarecdn.com/36c23111-871d-4d2a-927f-877df954b090/"
-/>
-
-## Features
-
-Click <Btn>Download .pbit</Btn> to download a Power BI [report template][pbit]:
-
-<Screenshot
-  highlight="inset(69% 1% 20% 5% round 10px)"
-  src="https://ucarecdn.com/4b93196e-3128-4b01-bd3f-eab8e7d8a37f/"
-/>
-
-Use can open it in Power BI to create a report.
-
-
-[pbit]: https://learn.microsoft.com/en-us/power-bi/create-reports/desktop-templates
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/sql-api.mdx b/docs/pages/product/apis-integrations/sql-api.mdx
index 662cc04c78..bc8c57355d 100644
--- a/docs/pages/product/apis-integrations/sql-api.mdx
+++ b/docs/pages/product/apis-integrations/sql-api.mdx
@@ -1,35 +1,33 @@
----
-redirect_from:
-  - /backend/sql
----
-
 # SQL API
 
-SQL API enables Cube to deliver data over the [Postgres-compatible
-protocol][postgres-protocol] to certain kinds of data applications, including
-but not limited to the following ones:
+The SQL API enables Cube to deliver data over the [Postgres-compatible
+protocol][postgres-protocol] to a wide range of [data visualization tools][ref-dataviz-tools].
+In general, if an application connects to [PostgreSQL][link-postgres] database,
+it can connect to Cube as well.
 
-- Most commonly, [business intelligence tools][ref-bi], e.g.,
-  [Tableau][ref-tableau], [Power BI][ref-powerbi], [ThoughtSpot][ref-thoughtspot],
-  [Sigma][ref-sigma], [Looker Studio][ref-looker-studio], [Superset /
-  Preset][ref-superset], and [Metabase][ref-metabase]
-- [Data notebooks][ref-notebooks], e.g., [Jupyter][ref-jupyter], [Hex][ref-hex],
-  or [Deepnote][ref-deepnote]
-- Reverse ETL tools, e.g., Census or Hightouch
+Unlike [DAX API][ref-dax-api], [MDX API][ref-mdx-api], and [Semantic Layer Sync][ref-sls],
+the SQL API provides a more generic way to work with Cube, limited to what the SQL
+query language and the Postgres protocol can offer.
 
-Often, the SQL API is used to enable internal or self-serve [business
-intelligence][cube-bi-use-case] use cases.
+The SQL API works with the following kinds of data applications:
 
-See [SQL API reference][ref-ref-sql-api] for the list of supported SQL commands,
-functions, and operators. Also, check [query format][ref-sql-query-format] for
-details about supported queries.
+- [BI tools][ref-bi], e.g., [ThoughtSpot][ref-thoughtspot], [Sigma][ref-sigma],
+[Looker Studio][ref-looker-studio], enabling internal or self-serve [business
+intelligence][cube-bi-use-case] use cases.
+- [Data notebooks][ref-notebooks], e.g., [Jupyter][ref-jupyter], [Hex][ref-hex],
+or [Deepnote][ref-deepnote].
+- Reverse ETL tools, e.g., Census or Hightouch.
 
-<InfoBox>
+<ReferenceBox>
 
 Please use [this GitHub issue](https://github.com/cube-js/cube/issues/3906) to
 suggest tools of your interest and vote for already proposed ones.
 
-</InfoBox>
+</ReferenceBox>
+
+See [SQL API reference][ref-ref-sql-api] for the list of supported SQL commands,
+functions, and operators. Also, check [query format][ref-sql-query-format] for
+details about supported queries.
 
 ## Example request
 
@@ -233,23 +231,24 @@ You can use the `CUBEJS_MAX_SESSIONS` environment variable to adjust the session
 limit.
 
 
+[link-postgres]: https://www.postgresql.org
+[ref-dax-api]: /product/apis-integrations/dax-api
+[ref-mdx-api]: /product/apis-integrations/mdx-api
+[ref-sls]: /product/apis-integrations/semantic-layer-sync
 [ref-sql-api-auth]: /product/apis-integrations/sql-api/security
 [ref-config-checksqlauth]: /reference/configuration/config#checksqlauth
 [ref-config-canswitchsqluser]: /reference/configuration/config#canswitchsqluser
+[ref-dataviz-tools]: /product/configuration/visualization-tools
 [ref-bi]: /product/configuration/visualization-tools#bi-data-exploration-tools
-[ref-superset]: /product/configuration/visualization-tools/superset
-[ref-tableau]: /product/configuration/visualization-tools/tableau
-[ref-powerbi]: /product/configuration/visualization-tools/powerbi
 [ref-thoughtspot]: /product/configuration/visualization-tools/thoughtspot
 [ref-sigma]: /product/configuration/visualization-tools/sigma
 [ref-looker-studio]: /product/configuration/visualization-tools/looker-studio
-[ref-metabase]: /product/configuration/visualization-tools/metabase
 [ref-notebooks]: /product/configuration/visualization-tools#notebooks
 [ref-jupyter]: /product/configuration/visualization-tools/jupyter
 [ref-hex]: /product/configuration/visualization-tools/hex
 [ref-deepnote]: /product/configuration/visualization-tools/deepnote
 [ref-sql-query-format]: /product/apis-integrations/sql-api/query-format
-[ref-ref-sql-api]: /reference/sql-api
+[ref-ref-sql-api]: /product/apis-integrations/sql-api/reference
 [ref-data-model-concepts]: /product/data-modeling/concepts
 [ref-regular-queries]: /product/apis-integrations/queries#regular-query
 [ref-queries-wpp]: /product/apis-integrations/queries#query-with-post-processing
diff --git a/docs/pages/product/apis-integrations/sql-api/_meta.js b/docs/pages/product/apis-integrations/sql-api/_meta.js
index 6a7fa408f3..05180f099a 100644
--- a/docs/pages/product/apis-integrations/sql-api/_meta.js
+++ b/docs/pages/product/apis-integrations/sql-api/_meta.js
@@ -1,5 +1,6 @@
 module.exports = {
   "query-format": "Query format",
   "joins": "Joins",
-  "security": "Authentication and Authorization"
+  "security": "Authentication and Authorization",
+  "reference": "Reference"
 }
\ No newline at end of file
diff --git a/docs/pages/product/apis-integrations/sql-api/query-format.mdx b/docs/pages/product/apis-integrations/sql-api/query-format.mdx
index 795b1b19ab..f93a19a419 100644
--- a/docs/pages/product/apis-integrations/sql-api/query-format.mdx
+++ b/docs/pages/product/apis-integrations/sql-api/query-format.mdx
@@ -440,7 +440,7 @@ As you can see, the sorting operation is done after the regular query and the pr
 [ref-data-model-concepts]: /product/data-modeling/concepts
 [ref-measure-types]: /reference/data-model/types-and-formats#measure-types
 [ref-query-default-limit]: /product/apis-integrations/queries#row-limit
-[ref-ref-sql-api]: /reference/sql-api
+[ref-ref-sql-api]: /product/apis-integrations/sql-api/reference
 
 [link-postgres-boolean]: https://www.postgresql.org/docs/current/datatype-boolean.html
 [link-selection-projection]: https://stackoverflow.com/a/1031101
diff --git a/docs/pages/reference/sql-api.mdx b/docs/pages/product/apis-integrations/sql-api/reference.mdx
similarity index 98%
rename from docs/pages/reference/sql-api.mdx
rename to docs/pages/product/apis-integrations/sql-api/reference.mdx
index 7f6c0a1f9f..28f7d57747 100644
--- a/docs/pages/reference/sql-api.mdx
+++ b/docs/pages/product/apis-integrations/sql-api/reference.mdx
@@ -5,7 +5,7 @@ as [functions and operators](#sql-functions-and-operators).
 
 <InfoBox>
 
-If you'd like to propose a function or an operator to be implemented by the SQL API,
+If you'd like to propose a function or an operator to be supported in the SQL API,
 check the existing [issues on GitHub][link-github-sql-api]. If there are no relevant
 issues, please [file a new one][link-github-new-sql-api-issue].
 
@@ -156,7 +156,7 @@ PostgreSQL][link-postgres-funcs].
 
 <InfoBox>
 
-You can learn more in the
+Learn more in the
 [relevant section](https://www.postgresql.org/docs/current/functions-comparison.html#FUNCTIONS-COMPARISON-OP-TABLE)
 of the PostgreSQL documentation.
 
@@ -175,7 +175,7 @@ of the PostgreSQL documentation.
 
 <InfoBox>
 
-You can learn more in the
+Learn more in the
 [relevant section](https://www.postgresql.org/docs/current/functions-comparison.html#FUNCTIONS-COMPARISON-PRED-TABLE)
 of the PostgreSQL documentation.
 
@@ -191,7 +191,7 @@ of the PostgreSQL documentation.
 
 <InfoBox>
 
-You can learn more in the
+Learn more in the
 [relevant section](https://www.postgresql.org/docs/current/functions-math.html#FUNCTIONS-MATH-FUNC-TABLE)
 of the PostgreSQL documentation.
 
@@ -219,7 +219,7 @@ of the PostgreSQL documentation.
 
 <InfoBox>
 
-You can learn more in the
+Learn more in the
 [relevant section](https://www.postgresql.org/docs/current/functions-math.html#FUNCTIONS-MATH-TRIG-TABLE)
 of the PostgreSQL documentation.
 
@@ -240,7 +240,7 @@ of the PostgreSQL documentation.
 
 <InfoBox>
 
-You can learn more in the
+Learn more in the
 [relevant section](https://www.postgresql.org/docs/current/functions-string.html#FUNCTIONS-STRING-SQL)
 of the PostgreSQL documentation.
 
@@ -265,7 +265,7 @@ of the PostgreSQL documentation.
 
 <InfoBox>
 
-You can learn more in the
+Learn more in the
 [relevant section](https://www.postgresql.org/docs/current/functions-string.html#FUNCTIONS-STRING-OTHER)
 of the PostgreSQL documentation.
 
@@ -285,7 +285,7 @@ of the PostgreSQL documentation.
 
 <InfoBox>
 
-You can learn more in the
+Learn more in the
 [relevant section](https://www.postgresql.org/docs/current/functions-matching.html)
 of the PostgreSQL documentation.
 
@@ -300,7 +300,7 @@ of the PostgreSQL documentation.
 
 <InfoBox>
 
-You can learn more in the
+Learn more in the
 [relevant section](https://www.postgresql.org/docs/current/functions-formatting.html)
 of the PostgreSQL documentation.
 
@@ -314,7 +314,7 @@ of the PostgreSQL documentation.
 
 <InfoBox>
 
-You can learn more in the
+Learn more in the
 [relevant section](https://www.postgresql.org/docs/current/functions-datetime.html#FUNCTIONS-DATETIME-TABLE)
 of the PostgreSQL documentation.
 
@@ -333,7 +333,7 @@ of the PostgreSQL documentation.
 
 <InfoBox>
 
-You can learn more in the
+Learn more in the
 [relevant section](https://www.postgresql.org/docs/current/functions-conditional.html)
 of the PostgreSQL documentation.
 
@@ -351,7 +351,7 @@ of the PostgreSQL documentation.
 
 <InfoBox>
 
-You can learn more in the
+Learn more in the
 [relevant section](https://www.postgresql.org/docs/current/functions-aggregate.html#FUNCTIONS-AGGREGATE-TABLE)
 of the PostgreSQL documentation.
 
@@ -377,7 +377,7 @@ of the relevant cube.
 
 <InfoBox>
 
-You can learn more in the
+Learn more in the
 [relevant section](https://www.postgresql.org/docs/current/functions-aggregate.html#FUNCTIONS-AGGREGATE-STATISTICS-TABLE)
 of the PostgreSQL documentation.
 
@@ -396,7 +396,7 @@ of the PostgreSQL documentation.
 
 <InfoBox>
 
-You can learn more in the
+Learn more in the
 [relevant section](https://www.postgresql.org/docs/current/functions-comparisons.html)
 of the PostgreSQL documentation.
 
diff --git a/docs/pages/product/auth.mdx b/docs/pages/product/auth.mdx
index 3825a1bc4e..be27c6d331 100644
--- a/docs/pages/product/auth.mdx
+++ b/docs/pages/product/auth.mdx
@@ -1,11 +1,55 @@
----
-redirect_from:
-  - /security
----
+# Access control
 
-# Overview
+Cube supports a few methods to authenticates requests to [APIs & integrations][ref-apis].
+Usually, an API supports authentication via [one of these methods][ref-apis-methods]:
+
+* [User name and password](#user-name-and-password) (e.g., used by the [SQL API][ref-sql-api]).
+* [Identity provider](#identity-provider) (e.g., used by the [Cube Cloud for Sheets][ref-cube-cloud-sheets]).
+* [Access token](#access-token) (e.g., used by the [REST API][ref-rest-api]).
+
+Regardless of the method, the authentication flow includes the following steps:
+
+* User identity information (e.g., password or access token) is passed to Cube.
+* Cube validates the identity information or trusts the identity provider.
+* User identity information is optionally enriched with additional attributes,
+such the user's role, via [authentication integration](#authentication-integration).
+* Finally, the API request is associated with a [security context][ref-sec-ctx].
+It is then used to configure [member-level security][ref-mls]
+and [row-level security][ref-rls] as well as set [data access policies][ref-dap].
+
+## User name and password
+
+Some visualization tools (e.g., BI tools) can pass user name and, sometimes, password to Cube.
+
+### Configuration
+
+Relevant configuration options: [`check_sql_auth`][ref-config-check-sql-auth] and [`can_switch_sql_user`][ref-config-can-switch-sql-user].
+
+Relevant environment variables: `CUBEJS_SQL_USER`, `CUBEJS_SQL_PASSWORD`, `CUBEJS_SQL_SUPER_USER`.
+
+## Identity provider
+
+Some visualization tools (e.g., [Cube Cloud for Sheets][ref-cube-cloud-sheets]) implement
+an OAuth 2.0 flow to authenticate users.
+
+<SuccessBox>
+
+OAuth 2.0 flow is available in Cube Cloud on [Premium and above](https://cube.dev/pricing) product tiers.
+
+</SuccessBox>
+
+During this flow, users are redirected to a login page of an identity provider (e.g., Google)
+where they enter their credentials. Then, the identity provider passes the user identity
+information to Cube Cloud.
+
+This method does not require any configuration.
+
+## Access token
+
+Some visualization tools (e.g., custom front-end applications) can pass access tokens based
+on the [JSON Web Token][wiki-jwt] (JWT) standard to Cube. These tokens can be either generated
+by these applications or obtained from an identity provider. Cube then validates these tokens.
 
-In Cube, authorization (or access control) is based on the **security context**.
 The diagram below shows how it works during the request processing in Cube:
 
 <div style={{ textAlign: "center" }}>
@@ -16,18 +60,44 @@ The diagram below shows how it works during the request processing in Cube:
   />
 </div>
 
-Authentication is handled outside of Cube. A typical use case would be:
+### Configuration
+
+Relevant configuration options: [`check_auth`][ref-config-check-auth] and [`jwt`][ref-config-jwt].
+
+Relevant environment variables: `CUBEJS_API_SECRET`, `CUBEJS_JWT_KEY`, `CUBEJS_JWK_URL`,
+`CUBEJS_JWT_AUDIENCE`, `CUBEJS_JWT_ISSUER`, `CUBEJS_JWT_SUBJECT`, `CUBEJS_JWT_CLAIMS_NAMESPACE`.
+
+### Custom authentication
+
+Cube allows you to provide your own JWT verification logic. You can use the
+[`check_auth`][ref-config-check-auth] configuration option to verify a JWT and set the security context.
 
-1.  A web server serves an HTML page containing the Cube client, which needs to
-    communicate securely with the Cube API.
-2.  The web server should generate a JWT with an expiry to achieve this. The
-    server could include the token in the HTML it serves or provide the token to
-    the frontend via an XHR request, which is then stored it in local storage or
+For example, if you needed to retrieve user information from an LDAP server,
+you might do the following:
+
+```javascript
+module.exports = {
+  checkAuth: async (req, auth) => {
+    try {
+      const userInfo = await getUserFromLDAP(req.get("X-LDAP-User-ID"))
+      return { security_context: userInfo }
+    }
+    catch {
+      throw new Error("Could not authenticate user from LDAP")
+    }
+  }
+}
+```
+
+A typical use case would be:
+
+1.  A web server serves a page which needs to communicate with the Cube API.
+2.  The web server generates a JWT. The
+    server includes the token in the page or provides the token to
+    the frontend via an XHR request. The token is then stored in the local storage or
     a cookie.
-3.  The JavaScript client is initialized using this token, and includes it in
-    calls to the Cube API.
-4.  The token is received by Cube, and verified using any available JWKS (if
-    configured)
+3.  The token is used for calls to the Cube API.
+4.  The token is received by Cube, and verified using any available JWKS (if configured)
 5.  Once decoded, the token claims are injected into the [security
     context][ref-sec-ctx].
 
@@ -38,7 +108,7 @@ can still use it to [pass a security context][ref-sec-ctx].
 
 </InfoBox>
 
-## Generating JSON Web Tokens (JWT)
+### Generating JSON Web Tokens
 
 Authentication tokens are generated based on your API secret. Cube CLI generates
 an API Secret when a project is scaffolded and saves this value in the `.env`
@@ -118,7 +188,7 @@ const cubeApi = cube(
 You can optionally store this token in local storage or in a cookie, so that you
 can then use it to query the Cube API.
 
-## Using JSON Web Key Sets (JWKS)
+### Using JSON Web Key Sets
 
 <InfoBox>
 
@@ -128,8 +198,6 @@ Cognito][ref-recipe-cognito] with Cube.
 
 </InfoBox>
 
-### Configuration
-
 As mentioned previously, Cube supports verifying JWTs using industry-standard
 JWKS. The JWKS can be provided either from a URL, or as a JSON object conforming
 to [JWK specification RFC 7517 Section 4][link-jwk-ref], encoded as a string.
@@ -177,7 +245,7 @@ Or configure the same using environment variables:
 CUBEJS_JWK_URL='<URL_TO_JWKS_JSON>'
 ```
 
-### Verifying claims
+#### Verifying claims
 
 Cube can also verify the audience, subject and issuer claims in JWTs. Similarly
 to JWK configuration, these can also be configured in the `cube.js`
@@ -201,7 +269,7 @@ CUBEJS_JWT_ISSUER='<ISSUER_FROM_IDENTITY_PROVIDER>'
 CUBEJS_JWT_SUBJECT='<SUBJECT_FROM_IDENTITY_PROVIDER>'
 ```
 
-### Custom claims namespace
+#### Custom claims namespace
 
 Cube can also extract claims defined in custom namespaces. Simply specify the
 namespace in your `cube.js` configuration file:
@@ -214,49 +282,42 @@ module.exports = {
 };
 ```
 
-### Caching
+## Authentication integration
 
-Cube caches JWKS by default when
-[`CUBEJS_JWK_URL` or `jwt.jwkUrl` is specified](#configuration).
+When using Cube Cloud, you can enrich the security context with information about
+an authenticated user, obtained during their authentication or loaded via an
+[LDAP integration][ref-ldap-integration].
 
-- If the response contains a `Cache-Control` header, then Cube uses it to
-  determine cache expiry.
-- The keys inside the JWKS are checked for expiry values and used for cache
-  expiry.
-- If an inbound request supplies a JWT referencing a key not found in the cache,
-  the cache is refreshed.
+<SuccessBox>
 
-## Custom authentication
+Authentication integration is available in Cube Cloud on [all product tiers](https://cube.dev/pricing).
 
-Cube also allows you to provide your own JWT verification logic by setting a
-[`checkAuth()`][ref-config-check-auth] function in the `cube.js` configuration
-file. This function is expected to verify a JWT and return its claims as the
-security context.
+</SuccessBox>
 
-As an example, if you needed to retrieve user information from an LDAP server,
-you might do the following:
+You can enable the authentication integration by navigating to the <Btn>Settings → Configuration</Btn>
+of your Cube Cloud deployment and using the <Btn>Enable Cloud Auth Integration</Btn> toggle.
 
-```javascript
-module.exports = {
-  checkAuth: async (req, auth) => {
-    try {
-      const userInfo = await getUserFromLDAP(req.get("X-LDAP-User-ID"));
-      return { security_context: userInfo };
-    } catch {
-      throw new Error("Could not authenticate user from LDAP");
-    }
-  },
-};
-```
 
-[link-jwt-docs]:
-  https://github.com/auth0/node-jsonwebtoken#token-expiration-exp-claim
+[wiki-jwt]: https://en.wikipedia.org/wiki/JSON_Web_Token
+[link-jwt-docs]: https://github.com/auth0/node-jsonwebtoken#token-expiration-exp-claim
 [link-jwt-libs]: https://jwt.io/#libraries-io
 [link-jwk-ref]: https://tools.ietf.org/html/rfc7517#section-4
-[ref-config-check-auth]: /reference/configuration/config#checkauth
+[ref-config-check-auth]: /reference/configuration/config#check_auth
+[ref-config-jwt]: /reference/configuration/config#jwt
+[ref-config-check-sql-auth]: /reference/configuration/config#check_sql_auth
+[ref-config-can-switch-sql-user]: /reference/configuration/config#can_switch_sql_user
 [ref-config-migrate-cube]:
   /product/configuration#migration-from-express-to-docker-template
 [ref-recipe-auth0]: /guides/recipes/auth/auth0-guide
 [ref-recipe-cognito]: /guides/recipes/auth/aws-cognito
 [ref-sec-ctx]: /product/auth/context
-[link-slack]: https://slack.cube.dev/
+[ref-apis]: /product/apis-integrations
+[ref-apis-methods]: /product/apis-integrations#authentication-methods
+[ref-rest-api]: /product/apis-integrations/rest-api
+[ref-sql-api]: /product/apis-integrations/sql-api
+[ref-dap]: /product/auth/data-access-policies
+[ref-mls]: /product/auth/member-level-security
+[ref-rls]: /product/auth/row-level-security
+[ref-auth-sso]: /product/workspace/sso
+[ref-ldap-integration]: /product/workspace/sso#ldap-integration
+[ref-cube-cloud-sheets]: /product/apis-integrations/google-sheets
\ No newline at end of file
diff --git a/docs/pages/product/auth/_meta.js b/docs/pages/product/auth/_meta.js
index 9f2bfa9f08..68c456f8a9 100644
--- a/docs/pages/product/auth/_meta.js
+++ b/docs/pages/product/auth/_meta.js
@@ -1,3 +1,6 @@
 module.exports = {
-  "context": "Security context"
+  "context": "Security context",
+  "member-level-security": "Member-level security",
+  "row-level-security": "Row-level security",
+  "data-access-policies": "Data access policies"
 }
\ No newline at end of file
diff --git a/docs/pages/product/auth/context.mdx b/docs/pages/product/auth/context.mdx
index 641497f7ae..7be8ba6b3c 100644
--- a/docs/pages/product/auth/context.mdx
+++ b/docs/pages/product/auth/context.mdx
@@ -31,6 +31,30 @@ inside:
 - the [`COMPILE_CONTEXT`][ref-cubes-compile-ctx] global, which is used to
   support [multi-tenant deployments][link-multitenancy].
 
+## Contents
+
+By convention, the contents of the security context should be an object (dictionary)
+with nested structure:
+
+```json
+{
+  "sub": "1234567890",
+  "iat": 1516239022,
+  "user_name": "John Doe",
+  "user_id": 42,
+  "location": {
+    "city": "San Francisco",
+    "state": "CA"
+  }
+}
+```
+
+### Reserved elements
+
+Some features of Cube Cloud (e.g., [authentication integration][ref-auth-integration]
+and [LDAP integration][ref-ldap-integration]) use the `cloud` element in the security context.
+This element is reserved and should not be used for other purposes.
+
 ## Using query_rewrite
 
 You can use [`query_rewrite`][ref-config-queryrewrite] to amend incoming queries
@@ -223,7 +247,6 @@ def masked(sql, security_context):
     return "'--- masked ---'"
 ```
 
-
 ### Usage with pre-aggregations
 
 To generate pre-aggregations that rely on `COMPILE_CONTEXT`, [configure
@@ -248,3 +271,5 @@ build one from a JSON object.
 [ref-cubes-compile-ctx]: /reference/data-model/context-variables#compile_context
 [ref-devtools-playground]:
   /product/workspace/playground#editing-the-security-context
+[ref-auth-integration]: /product/auth#authentication-integration
+[ref-ldap-integration]: /product/workspace/sso#ldap-integration
\ No newline at end of file
diff --git a/docs/pages/product/auth/data-access-policies.mdx b/docs/pages/product/auth/data-access-policies.mdx
new file mode 100644
index 0000000000..a96ece469e
--- /dev/null
+++ b/docs/pages/product/auth/data-access-policies.mdx
@@ -0,0 +1,173 @@
+# Data access policies
+
+Data access policies provide a holistic mechanism to manage [member-level](#member-level-access)
+and [row-level](#row-level-access) security for different [data access roles](#data-access-roles).
+You can define access control rules in data model files, allowing for an organized
+and maintainable approach to security.
+
+<YouTubeVideo
+  url="https://www.youtube.com/embed/yJfnYB27wSQ"
+  aspectRatio={4/3}
+/>
+
+## Data access roles
+
+Each request to Cube includes a [security context][ref-sec-ctx], which can contain
+information about the user. You can use the [`context_to_roles` configuration
+option][ref-ctx-to-roles] to derive the user's roles from the security context:
+
+<CodeTabs>
+
+```python
+from cube import config
+
+@config('context_to_roles')
+def context_to_roles(ctx: dict) -> list[str]:
+  return ctx['securityContext'].get('roles', ['default'])
+```
+
+```javascript
+module.exports = {
+  contextToRoles: ({ securityContext }) => {
+    return securityContext.roles || ['default']
+  }
+}
+```
+
+</CodeTabs>
+
+A user can have more than one role.
+
+## Policies
+
+You can define policies that target specific roles and contain member-level and (or)
+row-level security rules:
+
+<CodeTabs>
+
+```yaml
+cubes:
+  - name: orders
+    # ...
+
+    access_policy:
+        # For all roles, restrict access entirely
+      - role: "*"
+        member_level:
+          includes: []
+
+        # For the `manager` role,
+        #   allow access to all members
+        #   but filter rows by the user's country
+      - role: manager
+        conditions:
+          - if: "{ securityContext.is_EMEA_based }"
+        member_level:
+          includes: "*"
+        row_level:
+          filters:
+            - member: country
+              operator: equals
+              values: [ "{ securityContext.country }" ]
+```
+
+```javascript
+cube(`orders`, {
+  // ...
+
+  access_policy: [
+    {
+      // For all roles, restrict access entirely
+      role: `*`,
+      member_level: {
+        includes: []
+      }
+    },
+    {
+      // For the `manager` role,
+      //   allow access to all members
+      //   but filter rows by the user's country
+      role: `manager`,
+      conditions: [
+        { if: securityContext.is_EMEA_based }
+      ],
+      member_level: {
+        includes: `*`
+      },
+      row_level: {
+        filters: [
+          {
+            member: `country`,
+            operator: `equals`,
+            values: [ securityContext.country ]
+          }
+        ]
+      }
+    }
+  ]
+})
+```
+
+</CodeTabs>
+
+You can define data access policies both in cubes and views. If you use views,
+it is recommended to keep all your cubes private and define access policies in views only.
+It will make your security rules easier to maintain and reason about, especially
+when it comes to [member-level access](#member-level-access).
+
+For more details on available parameters, check out the [data access policies reference][ref-ref-dap].
+
+## Policy evaluation
+
+When processing a request, Cube will evaluate the data access policies and combine them
+with relevant custom security rules, e.g., [`public` parameters][ref-mls-public] for member-level security
+and [`query_rewrite` filters][ref-rls-queryrewrite] for row-level security.
+
+If multiple access policies apply to a request, they are _combined together_
+using the _OR_ semantics. For example, if a user has two roles with different
+policies, the user will get the union of the permissions in these policies.
+
+### Member-level access
+
+Member-level security rules in data access policies are _combined together_
+with `public` parameters of cube and view members using the _AND_ semantics.
+Both will apply to the request.
+
+_When querying a view,_ member-level security rules defined in the view are _**not** combined together_
+with member-level security rules defined in relevant cubes.
+**Only the ones from the view will apply to the request.**
+
+<InfoBox>
+
+This is consistent with how column-level security works in SQL databases. If you have
+a view that exposes a subset of columns from a table, it doesnt matter if the
+columns in the table are public or not, the view will expose them anyway.
+
+</InfoBox>
+
+### Row-level access
+
+Row-level filters in data access policies are _combined together_ with filters defined
+using the [`query_rewrite` configuration option][ref-config-queryrewrite].
+Both will apply to the request.
+
+_When querying a view,_ row-level filters defined in the view are _combined together_
+with row-level filters defined in relevant cubes. Both will apply to the request.
+
+<InfoBox>
+
+This is consistent with how row-level security works in SQL databases. If you have
+a view that exposes a subset of rows from another view, the result set will be
+filtered by the row-level security rules of both views.
+
+</InfoBox>
+
+
+[ref-mls]: /product/auth/member-level-security
+[ref-mls-public]: /product/auth/member-level-security#managing-member-level-access
+[ref-rls]: /product/auth/row-level-security
+[ref-rls-queryrewrite]: /product/auth/row-level-security#managing-row-level-access
+[ref-sec-ctx]: /product/auth/context
+[ref-ctx-to-roles]: /reference/configuration/config#context_to_roles
+[ref-ref-dap]: /reference/data-model/data-access-policies
+[ref-config-queryrewrite]: /reference/configuration/config#query_rewrite
\ No newline at end of file
diff --git a/docs/pages/product/data-modeling/concepts/publicity.mdx b/docs/pages/product/auth/member-level-security.mdx
similarity index 68%
rename from docs/pages/product/data-modeling/concepts/publicity.mdx
rename to docs/pages/product/auth/member-level-security.mdx
index 7d5d7f625f..2e469ed845 100644
--- a/docs/pages/product/data-modeling/concepts/publicity.mdx
+++ b/docs/pages/product/auth/member-level-security.mdx
@@ -1,21 +1,25 @@
-# Publicity of data model entities
+# Member-level security
 
-The data model serves as a facade of your data and enables running
-[queries][ref-queries] via a [rich set of APIs][ref-apis] by referencing data
-model [entities][ref-data-modeling-concepts]: cubes, views, and their members.
-Controlling whether they are public or not helps manage data access and expose
-a coherent representation of the data model to end users.
+The data model serves as a facade of your data. With member-level security,
+you can define whether [data model entities][ref-data-modeling-concepts] (cubes, views,
+and their members) are exposed to end users and can be queried via [APIs &
+integrations][ref-apis].
 
-By default, all cubes, views, measures, dimensions, and segments are *public*,
-meaning that they can be used in API queries and they are visible during data
-model introspection.
+Member-level security in Cube is similar to column-level security in SQL databases.
+Defining whether users have access to [cubes][ref-cubes] and [views][ref-views] is
+similar to defining access to database tables; defining whether they have access
+to dimensions and measures — to columns.
 
-## Managing publicity
+__By default, all cubes, views, and their members are *public*,__ meaning that they
+can be accessed by any users and they are also visible during data model introspection.
+
+## Managing member-level access
 
 You can explicitly make a data model entity public or private by setting its
 `public` parameter to `true` or `false`. This parameter is available for
 [cubes][ref-cubes-public], [views][ref-views-public], [measures][ref-measures-public],
-[dimensions][ref-dimensions-public], and [segments][ref-segments-public].
+[dimensions][ref-dimensions-public], [hierarchies][ref-hierarchies-public], and
+[segments][ref-segments-public].
 
 <InfoBox>
 
@@ -56,6 +60,16 @@ anyway, you can use the [`query_rewrite` configuration option][ref-query-rewrite
 
 ## Best practices
 
+### Data access policies
+
+You can use [data access policies][ref-dap] to manage both member-level and
+[row-level][ref-rls] security for different roles. With them, you can keep
+access control rules in one place instead of spreading them across a number of
+`public` parameters in a cube or a view.
+
+__It is recommended to use data access policies by default.__ You can also combine
+them with setting some `public` parameters manually for specific cases.
+
 ### Cubes and views
 
 If your data model contains both [cubes][ref-cubes] and [views][ref-views],
@@ -116,11 +130,11 @@ cube(`users`, {
 
 [ref-data-modeling-concepts]: /product/data-modeling/concepts
 [ref-apis]: /product/apis-integrations
-[ref-queries]: /product/apis-integrations/queries
 [ref-cubes-public]: /reference/data-model/cube#public
 [ref-views-public]: /reference/data-model/view#public
 [ref-measures-public]: /reference/data-model/measures#public
 [ref-dimensions-public]: /reference/data-model/dimensions#public
+[ref-hierarchies-public]: /reference/data-model/hierarchies#public
 [ref-segments-public]: /reference/data-model/segments#public
 [ref-cubes]: /product/data-modeling/concepts#cubes
 [ref-views]: /product/data-modeling/concepts#views
@@ -129,4 +143,6 @@ cube(`users`, {
 [ref-dynamic-data-modeling]: /product/data-modeling/dynamic
 [ref-query-rewrite]: /reference/configuration/config#query_rewrite
 [ref-dev-mode]: /product/configuration#development-mode
-[ref-playground]: /product/workspace/playground
\ No newline at end of file
+[ref-playground]: /product/workspace/playground
+[ref-dap]: /product/auth/data-access-policies
+[ref-rls]: /product/auth/row-level-security
\ No newline at end of file
diff --git a/docs/pages/product/auth/row-level-security.mdx b/docs/pages/product/auth/row-level-security.mdx
new file mode 100644
index 0000000000..d5c149cf42
--- /dev/null
+++ b/docs/pages/product/auth/row-level-security.mdx
@@ -0,0 +1,46 @@
+# Row-level security
+
+The data model serves as a facade of your data. With row-level security,
+you can define whether some [data model][ref-data-modeling-concepts] facts are exposed
+to end users and can be queried via [APIs & integrations][ref-apis].
+
+Row-level security in Cube is similar to row-level security in SQL databases.
+Defining whether users have access to specific facts from [cubes][ref-cubes] and
+[views][ref-views] is similar to defining access to rows in database tables.
+
+__By default, all rows are *public*,__ meaning that no filtering is applied to
+data model facts when they are accessed by any users.
+
+## Managing row-level access
+
+You can implement row-level access control by applying additional filters conditionally
+in the [`query_rewrite` configuration option][ref-query-rewrite].
+
+### Dynamic data models
+
+You can implement row-level access control at the data model level
+[dynamically][ref-dynamic-data-modeling] by adjusting the [`sql` parameter][ref-cubes-sql]
+of cubes.
+
+## Best practices
+
+### Data access policies
+
+You can use [data access policies][ref-dap] to manage both [member-level][ref-mls]
+and row-level security for different roles. With them, you can define access control
+rules in data model files instead of mixing them together in a single block of code
+in `query_rewrite`.
+
+__It is recommended to use data access policies by default.__ You can also combine
+them with using your own code in `query_rewrite` for specific cases.
+
+
+[ref-data-modeling-concepts]: /product/data-modeling/concepts
+[ref-apis]: /product/apis-integrations
+[ref-cubes]: /product/data-modeling/concepts#cubes
+[ref-views]: /product/data-modeling/concepts#views
+[ref-cubes-sql]: /reference/data-model/cube#sql
+[ref-dynamic-data-modeling]: /product/data-modeling/dynamic
+[ref-query-rewrite]: /reference/configuration/config#query_rewrite
+[ref-dap]: /product/auth/data-access-policies
+[ref-mls]: /product/auth/member-level-security
\ No newline at end of file
diff --git a/docs/pages/product/caching/running-in-production.mdx b/docs/pages/product/caching/running-in-production.mdx
index 1ec2e2fb7d..ec356669aa 100644
--- a/docs/pages/product/caching/running-in-production.mdx
+++ b/docs/pages/product/caching/running-in-production.mdx
@@ -377,10 +377,67 @@ It also requires the M [Cube Store Worker tier](/product/deployment/cloud/pricin
 You can provide, rotate, or drop your own [customer-managed keys][ref-cmk] (CMK)
 for Cube Store via the <Btn>Encryption Keys</Btn> page in Cube Cloud.
 
+## Troubleshooting
+
+### Heavy pre-aggregations
+
+When building some pre-aggregations, you might encounter the following error:
+
+```
+Error: Error during create table: CREATE TABLE <REDACTED>
+Error: Query execution timeout after 10 min of waiting
+```
+
+It means that your pre-aggregation is too heavy and takes too long to build.
+
+As a temporary solution, you can increase the timeout for all queies that Cube
+runs against your data source via the `CUBEJS_DB_QUERY_TIMEOUT` environment variable.
+
+However, it is recommended that you optimize your pre-aggregations instead:
+
+* Use an export bucket if your [data source][ref-data-sources] supports it. Cube will then load the pre-aggregation data in a much more efficient way.
+* Use [partitions][ref-pre-agg-partitions]. Cube will then run a separate query to build each partition.
+* Build pre-aggregations [incrementally][ref-pre-agg-incremental]. Cube will then build only the necessary partitions with each pre-aggregation refresh.
+* Set an appropriate [build range][ref-pre-agg-build-range] if you don't need to query the whole date range. Cube will then include only the necessary data in the pre-aggregation.
+* Check that your pre-aggregation includes only necessary dimensions. Each additional dimension usually increases the volume of the pre-aggregation data.
+  * If you include a high cardinality dimension, Cube needs to store a lot of data in the pre-aggregation. For example, if you include the primary key into the pre-aggregation, Cube will effectively need to store a copy of the original table in the pre-aggregation, which is rarely useful.
+  * If a single pre-aggregation is used by queries with different sets of dimensions, consider creating separate pre-aggregations for each set of dimensions. This way, Cube will only include necessary data in each pre-aggregation.
+* Check if you have a heavy calculation in the [`sql` expression][ref-cube-sql] of your cubes (rather than a simple `sql_table` reference). If it's the case, you can build an additional [`original_sql` pre-aggregation][ref-pre-agg-original-sql] and [instruct][ref-pre-agg-use-original-sql] Cube to use it when building other pre-aggregations for this cube.
+
+### MinIO
+
+When using MinIO for persistent storage, you might encounter the following error:
+
+```
+Error: Error during upload of <REDACTED>
+File <REDACTED> can't be listed after upload.
+Either there's Cube Store cluster misconfiguration,
+or storage can't provide the required consistency.
+```
+
+Most likely, it happens because MinIO is not providing strong consistency guarantees,
+as required for Cube Store's [persistent storage](#persistent-storage).
+You can either try configuring MinIO to provide strong consistency or switch to
+using S3 or GCS.
+
+<WarningBox>
+
+The support for MinIO as persistent storage in Cube Store was contributed by the community.
+It's not supported by Cube or the vendor.
+
+</WarningBox>
+
 
 [link-wsl2]: https://docs.microsoft.com/en-us/windows/wsl/install-win10
 [ref-caching-partitioning]: /product/caching/using-pre-aggregations#partitioning
 [ref-config-env]: /reference/configuration/environment-variables
 [link-parquet-encryption]: https://parquet.apache.org/docs/file-format/data-pages/encryption/
 [link-aes]: https://en.wikipedia.org/wiki/Advanced_Encryption_Standard
-[ref-cmk]: /product/workspace/encryption-keys
\ No newline at end of file
+[ref-cmk]: /product/workspace/encryption-keys
+[ref-data-sources]: /product/configuration/data-sources
+[ref-pre-agg-partitions]: /product/caching/using-pre-aggregations#partitioning
+[ref-pre-agg-incremental]: /reference/data-model/pre-aggregations#incremental
+[ref-pre-agg-build-range]: /reference/data-model/pre-aggregations#build_range_start-and-build_range_end
+[ref-cube-sql]: /reference/data-model/cube#sql
+[ref-pre-agg-original-sql]: /reference/data-model/pre-aggregations#original_sql
+[ref-pre-agg-use-original-sql]: /reference/data-model/pre-aggregations#use_original_sql_pre_aggregations
\ No newline at end of file
diff --git a/docs/pages/product/configuration.mdx b/docs/pages/product/configuration.mdx
index a8a196acae..855b8b53db 100644
--- a/docs/pages/product/configuration.mdx
+++ b/docs/pages/product/configuration.mdx
@@ -152,8 +152,7 @@ Cube can be run in an insecure, development mode by setting the
 mode does the following:
 
 - Disables authentication checks.
-- Disables access control checks based on the [publicity][ref-data-model-publicity]
-of data model entities.
+- Disables [member-level access control][ref-mls].
 - Enables Cube Store in single instance mode.
 - Enables background refresh for in-memory cache and [scheduled
   pre-aggregations][link-scheduled-refresh].
@@ -163,7 +162,7 @@ of data model entities.
 - Logs incorrect/invalid configuration for `externalRefresh` /`waitForRenew`
   instead of throwing errors.
 
-[ref-ref-meta]: /reference/rest-api#v1meta
+[ref-ref-meta]: /product/apis-integrations/rest-api/reference#v1meta
 [ref-rest-api]: /product/apis-integrations/rest-api
 [ref-gql-api]: /product/apis-integrations/graphql-api
 [ref-sql-api]: /product/apis-integrations/sql-api
@@ -177,6 +176,6 @@ of data model entities.
 [ref-dynamic-data-models]: /product/data-modeling/dynamic
 [ref-custom-docker-image]: /product/deployment/core#extend-the-docker-image
 [link-docker-env-vars]: https://docs.docker.com/compose/environment-variables/set-environment-variables/
-[ref-data-model-publicity]: /product/data-modeling/concepts/publicity
+[ref-mls]: /product/auth/member-level-security
 [link-current-python-version]: https://github.com/cube-js/cube/blob/master/packages/cubejs-docker/latest.Dockerfile#L13
 [link-current-nodejs-version]: https://github.com/cube-js/cube/blob/master/packages/cubejs-docker/latest.Dockerfile#L1
\ No newline at end of file
diff --git a/docs/pages/product/configuration/data-sources/ksqldb.mdx b/docs/pages/product/configuration/data-sources/ksqldb.mdx
index 008f4a2aff..6aa71bbac3 100644
--- a/docs/pages/product/configuration/data-sources/ksqldb.mdx
+++ b/docs/pages/product/configuration/data-sources/ksqldb.mdx
@@ -1,8 +1,3 @@
----
-redirect_from:
-  - /config/databases/ksqldb
----
-
 # ksqlDB
 
 [ksqlDB](https://ksqldb.io) is a purpose-built database for stream processing
@@ -18,7 +13,17 @@ ksqlDB support is available in Cube Cloud on the
 
 See how you can use ksqlDB and Cube Cloud to power real-time analytics in Power BI:
 
-<YouTubeVideo url="https://www.youtube.com/embed/RD_HZ7xE8G0" />
+<YouTubeVideo
+  url="https://www.youtube.com/embed/RD_HZ7xE8G0"
+  aspectRatio={4/3.55}
+/>
+
+<InfoBox>
+
+In this video, the SQL API is used to connect to [Power BI][ref-powerbi].
+Currently, it's recommended to use the [DAX API][ref-dax-api].
+
+</InfoBox>
 
 ## Prerequisites
 
@@ -69,3 +74,6 @@ CUBEJS_DB_PASS=password
 ksqlDB supports only
 [streaming pre-aggregations](/product/caching/using-pre-aggregations#streaming-pre-aggregations).
 
+
+[ref-powerbi]: /product/configuration/visualization-tools/powerbi
+[ref-dax-api]: /product/apis-integrations/dax-api
\ No newline at end of file
diff --git a/docs/pages/product/configuration/data-sources/pinot.mdx b/docs/pages/product/configuration/data-sources/pinot.mdx
index c27c478308..4d888e776f 100644
--- a/docs/pages/product/configuration/data-sources/pinot.mdx
+++ b/docs/pages/product/configuration/data-sources/pinot.mdx
@@ -3,7 +3,7 @@ redirect_from:
   - /config/databases/pinot
 ---
 
-# Pinot
+# Apache Pinot
 
 [Apache Pinot][link-pinot] is a real-time distributed OLAP datastore purpose-built
 for low-latency, high-throughput analytics, and perfect for user-facing analytical
@@ -14,6 +14,9 @@ workloads. [StarTree][link-startree] is a fully-managed platform for Pinot.
 - The hostname for the [Pinot][pinot] broker
 - The port for the [Pinot][pinot] broker
 
+With the current implementation of the Pinot driver, you have to enable the
+[multi-stage query engine][link-pinot-msqe] in your Pinot cluster.
+
 ## Setup
 
 <ReferenceBox>
@@ -93,6 +96,7 @@ Cube does not require any additional configuration to enable SSL as Pinot connec
 
 [link-pinot]: https://pinot.apache.org/
 [pinot]: https://docs.pinot.apache.org/
+[link-pinot-msqe]: https://docs.pinot.apache.org/reference/multi-stage-engine
 [pinot-docs-approx-agg-fns]:
   https://docs.pinot.apache.org/users/user-guide-query/query-syntax/how-to-handle-unique-counting
 [ref-recipe-enable-ssl]:
diff --git a/docs/pages/product/configuration/data-sources/vertica.mdx b/docs/pages/product/configuration/data-sources/vertica.mdx
index 5c73436dbe..de4151e9bf 100644
--- a/docs/pages/product/configuration/data-sources/vertica.mdx
+++ b/docs/pages/product/configuration/data-sources/vertica.mdx
@@ -1,5 +1,8 @@
 # Vertica
 
+[OpenText Analytics Database][opentext-adb] (Vertica) is a columnar database
+designed for big data analytics.
+
 ## Prerequisites
 
 - The hostname for the [Vertica][vertica] database server
@@ -41,6 +44,7 @@ To enable SSL-encrypted connections between Cube and Verica, set the
 configure custom certificates, please check out [Enable SSL Connections to the
 Database][ref-recipe-enable-ssl].
 
+[opentext-adb]: https://www.opentext.com/products/analytics-database?o=vert
 [vertica]: https://www.vertica.com/documentation/vertica/all/
 [ref-recipe-enable-ssl]:/guides/recipes/data-sources/using-ssl-connections-to-data-source
   
diff --git a/docs/pages/product/configuration/visualization-tools.mdx b/docs/pages/product/configuration/visualization-tools.mdx
index 959d0475e9..59d24d6c85 100644
--- a/docs/pages/product/configuration/visualization-tools.mdx
+++ b/docs/pages/product/configuration/visualization-tools.mdx
@@ -54,7 +54,7 @@ page, please [file an issue](https://github.com/cube-js/cube/issues) on GitHub.
   />
   <GridItem
     url="visualization-tools/powerbi"
-    imageUrl="https://static.cube.dev/icons/powerbi.svg"
+    imageUrl="https://static.cube.dev/icons/power-bi-dark.svg"
     title="Microsoft Power BI"
   />
   <GridItem
diff --git a/docs/pages/product/configuration/visualization-tools/_meta.js b/docs/pages/product/configuration/visualization-tools/_meta.js
index 00a181b57a..e76a21afc4 100644
--- a/docs/pages/product/configuration/visualization-tools/_meta.js
+++ b/docs/pages/product/configuration/visualization-tools/_meta.js
@@ -3,7 +3,6 @@ module.exports = {
   "bubble": "Bubble",
   "budibase": "Budibase",
   "deepnote": "Deepnote",
-  "excel": "Excel",
   "explo": "Explo",
   "google-sheets": "Google Sheets",
   "hashboard": "Hashboard",
@@ -14,8 +13,9 @@ module.exports = {
   "langchain": "LangChain",
   "looker-studio": "Looker Studio",
   "metabase": "Metabase",
+  "excel": "Microsoft Excel",
+  "powerbi": "Microsoft Power BI",
   "observable": "Observable",
-  "powerbi": "Power BI",
   "push-ai": "Push.ai",
   "qlik-sense": "Qlik Sense",
   "quicksight": "QuickSight",
diff --git a/docs/pages/product/configuration/visualization-tools/appsmith.mdx b/docs/pages/product/configuration/visualization-tools/appsmith.mdx
index 5ea2a165ed..a772f76b6f 100644
--- a/docs/pages/product/configuration/visualization-tools/appsmith.mdx
+++ b/docs/pages/product/configuration/visualization-tools/appsmith.mdx
@@ -20,11 +20,11 @@ detailed instructions.
 
 ## Connect from Cube Core
 
-You can connect a Cube deployment to Appsmith using the [REST API](/reference/rest-api).
+You can connect a Cube deployment to Appsmith using the [REST API](/product/apis-integrations/rest-api).
 
 For a Cube instance publicly available at a specific `HOST`, the REST API URL
 would be `HOST/cubejs-api/v1`. Please refer to the
-[REST API page](/reference/rest-api) for details.
+[REST API page](/product/apis-integrations/rest-api) for details.
 
 You will also need to generate a JSON Web Token that would be used to
 authenticate requests to Cube.
diff --git a/docs/pages/product/configuration/visualization-tools/bubble.mdx b/docs/pages/product/configuration/visualization-tools/bubble.mdx
index cffd91762e..c696cdfcd2 100644
--- a/docs/pages/product/configuration/visualization-tools/bubble.mdx
+++ b/docs/pages/product/configuration/visualization-tools/bubble.mdx
@@ -20,11 +20,11 @@ detailed instructions.
 
 ## Connect from Cube Core
 
-You can connect a Cube deployment to Bubble using the [REST API](/reference/rest-api).
+You can connect a Cube deployment to Bubble using the [REST API](/product/apis-integrations/rest-api).
 
 For a Cube instance publicly available at a specific `HOST`, the REST API URL
 would be `HOST/cubejs-api/v1`. Please refer to the
-[REST API page](/reference/rest-api) for details.
+[REST API page](/product/apis-integrations/rest-api) for details.
 
 You will also need to generate a JSON Web Token that would be used to
 authenticate requests to Cube.
diff --git a/docs/pages/product/configuration/visualization-tools/budibase.mdx b/docs/pages/product/configuration/visualization-tools/budibase.mdx
index 1572ec3699..15e5e7f94d 100644
--- a/docs/pages/product/configuration/visualization-tools/budibase.mdx
+++ b/docs/pages/product/configuration/visualization-tools/budibase.mdx
@@ -21,11 +21,11 @@ detailed instructions.
 
 ## Connect from Cube Core
 
-You can connect a Cube deployment to Budibase using the [REST API](/reference/rest-api).
+You can connect a Cube deployment to Budibase using the [REST API](/product/apis-integrations/rest-api).
 
 For a Cube instance publicly available at a specific `HOST`, the REST API URL
 would be `HOST/cubejs-api/v1`. Please refer to the
-[REST API page](/reference/rest-api) for details.
+[REST API page](/product/apis-integrations/rest-api) for details.
 
 You will also need to generate a JSON Web Token that would be used to
 authenticate requests to Cube.
diff --git a/docs/pages/product/configuration/visualization-tools/excel.mdx b/docs/pages/product/configuration/visualization-tools/excel.mdx
index 76c8bb4d2d..f14cfe565d 100644
--- a/docs/pages/product/configuration/visualization-tools/excel.mdx
+++ b/docs/pages/product/configuration/visualization-tools/excel.mdx
@@ -3,26 +3,49 @@
 [Microsoft Excel](https://www.microsoft.com/en-us/microsoft-365/excel) is a
 popular spreadsheet application.
 
+<YouTubeVideo
+  url="https://www.youtube.com/embed/vG7iEdYTvIQ"
+  aspectRatio={5/4}
+/>
+
 ## Connect from Cube Cloud
 
-Cube Cloud provides the [MDX API][ref-mdx-api] for Excel.
+Cube Cloud provides two options to connect to Excel:
+
+| | [MDX API][ref-mdx-api] | [Cube Cloud for Excel][ref-cube-cloud-for-excel] |
+| --- | --- | --- |
+| Operating systems | Microsoft Windows | All, including macOS |
+| Platforms | Desktop | All, including web and mobile |
+| Pivot table support | Native [PivotTable][link-pivottable] | Custom [pivot table][ref-cube-cloud-for-excel-pivot] UI |
 
-Navigate to the [Integrations](/product/workspace/integrations#connect-specific-tools)
-page, click <Btn>Connect to Cube</Btn>, and choose <Btn>Microsoft Excel</Btn> to get
-detailed instructions.
+Navigate to the [Integrations][ref-integrations-tools] page, click <Btn>Connect to Cube</Btn>,
+and choose <Btn>Microsoft Excel</Btn> to get detailed instructions.
 
-<InfoBox>
+## Connect from Cube Core
 
 There's no way to connect a Cube Core deployment to Excel.
 
-</InfoBox>
+## Connect from Microsoft Excel
 
-## Connecting from Excel
+### MDX API
 
 In Excel, go to the <Btn>Data</Btn> tab of the ribbon, click <Btn>Get Data</Btn>
-and select <Btn>From Database → From Analysis Services</Btn>.
+and select <Btn>From Database → From Analysis Services</Btn>. Then, enter the
+credentials.
+
+To find your MDX API credentials, go to the [Integrations][ref-integrations-apis] page, click
+<Btn>API credentials</Btn>, and choose the <Btn>MDX API</Btn> tab.
 
-For additional configuration options, check the [MDX API][ref-mdx-api] page.
+### Cube Cloud for Excel
 
+Follow the instructions to [install][ref-cube-cloud-for-excel-installation] the
+add-in and [authenticate][ref-cube-cloud-for-excel-authentication] to Cube Cloud.
 
 [ref-mdx-api]: /product/apis-integrations/mdx-api
+[link-pivottable]: https://support.microsoft.com/en-us/office/create-a-pivottable-to-analyze-worksheet-data-a9a84538-bfe9-40a9-a8e9-f99134456576
+[ref-cube-cloud-for-excel]: /product/apis-integrations/microsoft-excel
+[ref-cube-cloud-for-excel-pivot]: /product/apis-integrations/microsoft-excel#create-reports-via-pivot-table
+[ref-cube-cloud-for-excel-installation]: /product/apis-integrations/microsoft-excel#installation
+[ref-cube-cloud-for-excel-authentication]: /product/apis-integrations/microsoft-excel#authentication
+[ref-integrations-tools]: /product/workspace/integrations#connect-specific-tools
+[ref-integrations-apis]: /product/workspace/integrations#view-api-credentials
\ No newline at end of file
diff --git a/docs/pages/product/configuration/visualization-tools/google-sheets.mdx b/docs/pages/product/configuration/visualization-tools/google-sheets.mdx
index d10f82e313..17245340c4 100644
--- a/docs/pages/product/configuration/visualization-tools/google-sheets.mdx
+++ b/docs/pages/product/configuration/visualization-tools/google-sheets.mdx
@@ -3,7 +3,10 @@
 [Google Sheets][link-google-sheets] is an online, collaborative spreadsheets
 application.
 
-<YouTubeVideo url="https://www.youtube.com/embed/qPp9hroqd4g"/>
+<YouTubeVideo
+  url="https://www.youtube.com/embed/qPp9hroqd4g"
+  aspectRatio={4/2.56}
+/>
 
 ## Connect from Cube Cloud
 
diff --git a/docs/pages/product/configuration/visualization-tools/klipfolio.mdx b/docs/pages/product/configuration/visualization-tools/klipfolio.mdx
index 3b38fa1af8..c7fc549706 100644
--- a/docs/pages/product/configuration/visualization-tools/klipfolio.mdx
+++ b/docs/pages/product/configuration/visualization-tools/klipfolio.mdx
@@ -20,7 +20,7 @@ detailed instructions.
 
 ## Connect from Cube Core
 
-You can connect a Cube deployment to Klipfolio PowerMetrics using the [REST API](/reference/rest-api).
+You can connect a Cube deployment to Klipfolio PowerMetrics using the [REST API](/product/apis-integrations/rest-api).
 
 ## Connecting in Klipfolio
 
diff --git a/docs/pages/product/configuration/visualization-tools/observable.mdx b/docs/pages/product/configuration/visualization-tools/observable.mdx
index f9b0068e93..b82a6ff86a 100644
--- a/docs/pages/product/configuration/visualization-tools/observable.mdx
+++ b/docs/pages/product/configuration/visualization-tools/observable.mdx
@@ -75,7 +75,7 @@ You can also create a visualization of the executed SQL query.
 
 For a Cube instance publicly available at a specific `HOST`, the REST API URL
 would be `HOST/cubejs-api/v1`. Please refer to the
-[REST API page](/reference/rest-api) for details.
+[REST API page](/product/apis-integrations/rest-api) for details.
 
 You will also need to generate a JSON Web Token that would be used to
 authenticate requests to Cube.
diff --git a/docs/pages/product/configuration/visualization-tools/powerbi.mdx b/docs/pages/product/configuration/visualization-tools/powerbi.mdx
index 2134347f4f..d368f06440 100644
--- a/docs/pages/product/configuration/visualization-tools/powerbi.mdx
+++ b/docs/pages/product/configuration/visualization-tools/powerbi.mdx
@@ -1,30 +1,34 @@
----
-redirect_from:
-  - /config/downstream/powerbi
----
+# Microsoft Power BI
 
-# Power BI
+[Microsoft Power BI][link-powerbi] is a popular business intelligence tool.
 
-[Power BI](https://www.microsoft.com/en-gb/power-platform/products/power-bi/)
-is an interactive data visualization software product developed by Microsoft.
+Cube Cloud works with both [Power BI Desktop and Power BI service][link-powerbi-desktop-vs-service].
+If you're using Power BI service, you need to set up an [on-premises data gateway][link-powerbi-gateway].
 
-See how you can use [ksqlDB][ref-ksqldb] and Cube Cloud to power real-time
-analytics in Power BI:
-
-<YouTubeVideo url="https://www.youtube.com/embed/RD_HZ7xE8G0" />
+<YouTubeVideo
+  url="https://www.youtube.com/embed/vgrFPOMuJJs"
+  aspectRatio={8/5}
+/>
 
 ## Connect from Cube Cloud
 
-It is recommended to use [Semantic Layer Sync][ref-sls] to connect Cube Cloud to
-Power BI. It automatically synchronizes the [data model][ref-data-model] with Power BI.
+Cube Cloud provides the [DAX API][ref-dax-api] to connect to Power BI.
+
+Navigate to the [Integrations][ref-integrations-tools] page, click <Btn>Connect to Cube</Btn>,
+and choose <Btn>Microsoft Power BI</Btn> to get detailed instructions.
+
+<InfoBox>
+
+Previously, [Semantic Layer Sync][ref-sls] was recommended as a way to connect
+to Power BI. Since the introduction of the DAX API, it's now the preferred
+method.
 
-Navigate to the [Integrations](/product/workspace/integrations#connect-specific-tools)
-page, click <Btn>Connect to Cube</Btn>, and choose <Btn>Microsoft Power BI</Btn> to get
-detailed instructions.
+</InfoBox>
 
 ## Connect from Cube Core
 
 You can connect a Cube deployment to Power BI using the [SQL API][ref-sql-api].
+However, it would not provide the same experience as the DAX API.
 
 In Cube Core, the SQL API is disabled by default. Enable it and [configure
 the credentials](/product/apis-integrations/sql-api#configuration) to
@@ -32,26 +36,32 @@ connect to Power BI.
 
 ## Connecting from Power BI
 
-Power BI connects to Cube as to a Postgres database using the
-[DirectQuery][link-powerbi-directquery] connectivity mode.
+### DAX API
+
+In Power BI, choose the <Btn>SQL Server Analysis Services database</Btn> option
+when connecting to a data source. The, enter the credentials.
+
+To find your DAX API credentials, go to the [Integrations][ref-integrations-apis] page,
+click <Btn>API credentials</Btn>, and choose the <Btn>DAX API</Btn> tab.
 
 <InfoBox>
 
-It's not recommended to import data into Power BI when connecting to Cube;
-choose DirectQuery instead. Use [pre-aggregations][ref-pre-aggs] to improve
-querying performance and manage data freshness upstream of Power BI.
+It's not recommended to import data into Power BI when connecting to Cube.
+Use a _live connection_ whenever possible. [Read more][ref-powerbi-connection-methods]
+about pros and cons of these methods.
 
 </InfoBox>
 
-### Querying data
+### SQL API
 
-Your cubes will be exposed as tables, where both your measures and dimensions
-are columns.
+Power BI can also connect to Cube as to a Postgres database.
 
-[ref-getting-started]: /product/getting-started/cloud
+[link-powerbi]: https://www.microsoft.com/en-gb/power-platform/products/power-bi/
+[link-powerbi-desktop-vs-service]: https://learn.microsoft.com/en-us/power-bi/fundamentals/service-service-vs-desktop
+[link-powerbi-gateway]: https://learn.microsoft.com/en-us/power-bi/connect-data/service-gateway-onprem
+[ref-dax-api]: /product/apis-integrations/dax-api
+[ref-integrations-tools]: /product/workspace/integrations#connect-specific-tools
+[ref-integrations-apis]: /product/workspace/integrations#view-api-credentials
 [ref-sql-api]: /product/apis-integrations/sql-api
-[ref-pre-aggs]: /product/caching/using-pre-aggregations
 [ref-sls]: /product/apis-integrations/semantic-layer-sync
-[ref-data-model]: /product/data-modeling/overview
-[ref-ksqldb]: /product/configuration/data-sources/ksqldb
-[link-powerbi-directquery]: https://learn.microsoft.com/en-us/power-bi/connect-data/desktop-use-directquery
\ No newline at end of file
+[ref-powerbi-connection-methods]: /product/apis-integrations/dax-api#connection-methods
\ No newline at end of file
diff --git a/docs/pages/product/configuration/visualization-tools/push-ai.mdx b/docs/pages/product/configuration/visualization-tools/push-ai.mdx
index d2a32b7a97..8dedb79c4d 100644
--- a/docs/pages/product/configuration/visualization-tools/push-ai.mdx
+++ b/docs/pages/product/configuration/visualization-tools/push-ai.mdx
@@ -20,7 +20,7 @@ detailed instructions.
 
 ## Connect from Cube Core
 
-You can connect a Cube deployment to Push.ai using the [REST API](/reference/rest-api).
+You can connect a Cube deployment to Push.ai using the [REST API](/product/apis-integrations/rest-api).
 
 ## Connecting from Push.ai
 
diff --git a/docs/pages/product/configuration/visualization-tools/retool.mdx b/docs/pages/product/configuration/visualization-tools/retool.mdx
index 2c866a8e36..4a19b37f0a 100644
--- a/docs/pages/product/configuration/visualization-tools/retool.mdx
+++ b/docs/pages/product/configuration/visualization-tools/retool.mdx
@@ -20,7 +20,7 @@ detailed instructions.
 
 ## Connect from Cube Core
 
-You can connect a Cube deployment to Retool using the [REST API](/reference/rest-api).
+You can connect a Cube deployment to Retool using the [REST API](/product/apis-integrations/rest-api).
 
 ## Connecting from Retool
 
diff --git a/docs/pages/product/configuration/visualization-tools/steep.mdx b/docs/pages/product/configuration/visualization-tools/steep.mdx
index bd045667f8..c9fa35b6fb 100644
--- a/docs/pages/product/configuration/visualization-tools/steep.mdx
+++ b/docs/pages/product/configuration/visualization-tools/steep.mdx
@@ -21,7 +21,7 @@ detailed instructions.
 
 ## Connect from Cube Core
 
-You can connect a Cube deployment to Steep using the [REST API](/reference/rest-api).
+You can connect a Cube deployment to Steep using the [REST API](/product/apis-integrations/rest-api).
 
 ## Connecting from Steep
 
diff --git a/docs/pages/product/configuration/visualization-tools/superset.mdx b/docs/pages/product/configuration/visualization-tools/superset.mdx
index 5d61ef36cf..8815134c3e 100644
--- a/docs/pages/product/configuration/visualization-tools/superset.mdx
+++ b/docs/pages/product/configuration/visualization-tools/superset.mdx
@@ -1,10 +1,4 @@
----
-redirect_from:
-  - /recipes/using-apache-superset-with-cube-sql
-  - /config/downstream/superset
----
-
-# Superset / Preset
+# Apache Superset / Preset
 
 [Apache Superset][superset] is a popular open-source data exploration and
 visualization platform. [Preset][preset] is a fully-managed service for
diff --git a/docs/pages/product/data-modeling/concepts.mdx b/docs/pages/product/data-modeling/concepts.mdx
index 2cb3282c12..e05b4faa81 100644
--- a/docs/pages/product/data-modeling/concepts.mdx
+++ b/docs/pages/product/data-modeling/concepts.mdx
@@ -34,7 +34,7 @@ We'll use a sample e-commerce database with two tables, `orders` and
 
 ## Cubes
 
-A [cube][ref-cubes] represents a dataset in Cube, and is conceptually similar to a [view in
+_Cubes_ represent datasets in Cube and are conceptually similar to [views in
 SQL][wiki-view-sql]. Cubes are usually declared in separate files with one
 cube per file. Typically, a cube points to a single table in
 your database using the [`sql_table` property][ref-schema-ref-sql-table]:
@@ -82,15 +82,18 @@ cubes:
 
 </CodeTabs>
 
-Within each cube are definitions of [dimensions][self-dimensions],
-[measures][self-measures], and [segments](#segments). [Joins](#joins) are used
-to define relations between cubes; [pre-aggregations](#pre-aggregations) are
-designed to accelerate queries to cubes.
+Each cube contains the definitions of its _members_: [dimensions](#dimensions),
+[measures](#measures), and [segments](#segments). You can control the access to
+cubes and their members by configuring the [member-level security][ref-mls].
+
+[Joins](#joins) are used to define relations between cubes.
+[Pre-aggregations](#pre-aggregations) are used to accelerate queries to cubes.
+Cubes and their members can be further referenced by [views](#views).
 
 Note that cubes support [extension][ref-extending-cubes],
 [polymorphism][ref-polymorphic-cubes], and [data blending][ref-data-blending].
-Also, cubes should not necessarily be defined statically; you can actually build
-[dynamic data models][ref-dynamic-data-models].
+Cubes can be defined statically and you can also build [dynamic data
+models][ref-dynamic-data-models].
 
 <InfoBox>
 
@@ -100,18 +103,24 @@ For massive [multi-tenancy][ref-multitenancy] configurations, e.g., with more th
 
 </InfoBox>
 
+<ReferenceBox>
+
+See the reference documentaton for the full list of cube [parameters][ref-cubes].
+
+</ReferenceBox>
+
 ## Views
 
-Views sit on top of the data graph of cubes and create a facade of your whole
+_Views_ sit on top of the data graph of cubes and create a facade of your whole
 data model with which data consumers can interact. They are useful for defining
 metrics, managing governance and data access, and controlling ambiguous join
 paths.
 
 <Diagram src="https://ucarecdn.com/bfc3e04a-b690-40bc-a6f8-14a9175fb4fd/" />
 
-Views can **not** have their own members. Instead, they use the `cubes`
-parameter to include members of cubes. Optionally, you can also group members of a view
-into [folders][ref-ref-folders].
+Views do **not** define their own members. Instead, they reference cubes by
+specific join paths and include their members. Optionally, you can also group
+members of a view into [folders][ref-ref-folders].
 
 In the example below, we create the `orders` view which includes select members
 from `base_orders`, `products`, and `users` cubes:
@@ -182,12 +191,18 @@ views:
 Views do **not** define any [pre-aggregations](#pre-aggregations). Instead,
 they [reuse][ref-matching-preaggs] pre-aggregations from underlying cubes.
 
-View may not only be defined statically; you can actually build
-[dynamic data models][ref-dynamic-data-models].
+View can be defined statically and you can also build [dynamic data
+models][ref-dynamic-data-models].
+
+<ReferenceBox>
+
+See the reference documentaton for the full list of view [parameters][ref-views].
+
+</ReferenceBox>
 
 ## Dimensions
 
-Dimensions represent the properties of a **single** data point in the cube.
+_Dimensions_ represent the properties of a **single** data point in the cube.
 [The `orders` table](#top) contains only dimensions, so representing them in the
 `orders` cube is straightforward:
 
@@ -289,10 +304,29 @@ Also, [proxy dimensions][ref-proxy-dimensions] are helpful for code reusability
 and [subquery dimensions][ref-subquery-dimensions] can be used to join cubes
 implicitly.
 
+<ReferenceBox>
+
+See the reference documentaton for the full list of [dimension parameters][ref-dimensions].
+
+</ReferenceBox>
+
 ### Dimension types
 
-Dimensions can be of different types. See the [dimension type
-reference][ref-schema-dimension-types] for details.
+Dimensions can be of different types, e.g., `string`, `number`, or `time`. Often,
+data types in SQL are mapped to dimension types in the following way:
+
+| Data type in SQL | Dimension type in Cube |
+| --- | --- |
+| `timestamp`, `date`, `time` | [`time`](/reference/data-model/types-and-formats#time-1) |
+| `text`, `varchar` | [`string`](/reference/data-model/types-and-formats#string-1) |
+| `integer`, `bigint`, `decimal` | [`number`](/reference/data-model/types-and-formats#number-1) |
+| `boolean` | [`boolean`](/reference/data-model/types-and-formats#boolean-1) |
+
+<ReferenceBox>
+
+See the [dimension type reference][ref-ref-dimension-types] for details.
+
+</ReferenceBox>
 
 ### Time dimensions
 
@@ -377,7 +411,7 @@ Time dimensions are essential to enabling performance boosts such as
 
 ## Measures
 
-Measures represent the properties of a **set of data points** in the cube. To
+_Measures_ represent the properties of a **set of data points** in the cube. To
 add a measure called `count` to our `orders` cube, for example, we can do the
 following:
 
@@ -438,15 +472,19 @@ cubes:
 
 </CodeTabs>
 
-Also, [calculated measures][ref-calculated-measures] can be used to perform calculations
-on other measures.
+[Calculated measures][ref-calculated-measures] and [subquery dimensions][ref-subquery-dimensions]
+can be used for measure composition.
 
-### Measure types
+<ReferenceBox>
 
-Measures can be of different types. See the [measure type
-reference][ref-schema-measure-types] for details.
+See the reference documentaton for the full list of measure [parameters][ref-measures].
 
-Often, aggregate functions in SQL are mapped to measure types in the following way:
+</ReferenceBox>
+
+### Measure types
+
+Measures can be of different types, e.g., `count`, `sum`, or `number`. Often,
+aggregate functions in SQL are mapped to measure types in the following way:
 
 | Aggregate function in SQL | Measure type in Cube |
 | --- | --- |
@@ -462,6 +500,12 @@ Often, aggregate functions in SQL are mapped to measure types in the following w
 | `SUM` | [`sum`](/reference/data-model/types-and-formats#sum) |
 | Any function returning a timestamp, e.g., `MAX(time)` | [`time`](/reference/data-model/types-and-formats#time) |
 
+<ReferenceBox>
+
+See the [measure type reference][ref-ref-measure-types] for details.
+
+</ReferenceBox>
+
 ### Measure additivity
 
 Additivity is a property of measures that detemines whether measure values,
@@ -578,7 +622,7 @@ an impact on [pre-aggregation matching][ref-matching-preaggs].
 
 ## Joins
 
-Joins define the relationships between cubes, which then allows accessing and
+_Joins_ define the relationships between cubes, which then allows accessing and
 comparing properties from two or more cubes at the same time. In Cube, all joins
 are `LEFT JOIN`s.
 
@@ -624,15 +668,22 @@ cubes:
 
 </CodeTabs>
 
-There are three [types of join relationships][ref-schema-ref-joins-types]
+There are three [types of join relationships][ref-ref-join-types]
 (`one_to_one`, `one_to_many`, and `many_to_one`) and a few [other 
-concepts][ref-working-with-joins].
+concepts][ref-working-with-joins] such as the direction of joins and trasitive
+joins pitfalls.
+
+<ReferenceBox>
+
+See the reference documentaton for the full list of join [parameters][ref-joins].
+
+</ReferenceBox>
 
 ## Segments
 
-Segments are filters that are predefined in the data model instead of [a Cube
-query][ref-backend-query-filters]. They allow simplifying Cube queries and make
-it easy to re-use common filters across a variety of queries.
+_Segments_ are pre-defined filters that are kept within the data model instead of
+[a Cube query][ref-backend-query-filters]. They help to simplify queries and make
+it easy to reuse common filters across a variety of queries.
 
 To add a segment which limits results to completed orders, we can do the
 following:
@@ -663,11 +714,17 @@ cubes:
 
 </CodeTabs>
 
+<ReferenceBox>
+
+See the reference documentaton for the full list of segment [parameters][ref-segments].
+
+</ReferenceBox>
+
 ## Pre-aggregations
 
-Pre-aggregations are a powerful way of caching frequently-used, expensive
-queries and keeping the cache up-to-date on a periodic basis. Within a data
-model, they are defined under the `pre_aggregations` property:
+_Pre-aggregations_ provide a powerful way to accelerate frequently used queries
+and keep the cache up-to-date. Within a data model, they are defined using the
+`pre_aggregations` property:
 
 <CodeTabs>
 
@@ -706,31 +763,41 @@ cubes:
 A more thorough introduction can be found in [Getting Started with
 Pre-Aggregations][ref-caching-preaggs-intro].
 
+<ReferenceBox>
+
+See the reference documentaton for the full list of pre-aggregation
+[parameters][ref-preaggs].
+
+</ReferenceBox>
+
+
 [ref-backend-query-filters]:
   /product/apis-integrations/rest-api/query-format#filters-format
 [ref-caching-preaggs-intro]: /product/caching/getting-started-pre-aggregations
 [ref-caching-use-preaggs-partition-time]:
   /product/caching/using-pre-aggregations#partitioning
-[ref-schema-dimension-types]:
-  /reference/data-model/types-and-formats#dimension-types
-[ref-schema-measure-types]:
-  /reference/data-model/types-and-formats#measure-types
-[ref-schema-ref-joins-types]:
-  /reference/data-model/joins#relationship
+[ref-ref-dimension-types]: /reference/data-model/types-and-formats#dimension-types
+[ref-ref-measure-types]: /reference/data-model/types-and-formats#measure-types
+[ref-ref-join-types]: /reference/data-model/joins#relationship
 [ref-schema-ref-sql]: /reference/data-model/cube#sql
 [ref-schema-ref-sql-table]: /reference/data-model/cube#sql_table
 [ref-tutorial-incremental-preagg]:
   /reference/data-model/pre-aggregations#incremental
 [ref-cubes]: /reference/data-model/cube
+[ref-views]: /reference/data-model/view
+[ref-dimensions]: /reference/data-model/dimensions
+[ref-measures]: /reference/data-model/measures
+[ref-joins]: /reference/data-model/joins
+[ref-segments]: /reference/data-model/segments
+[ref-preaggs]: /reference/data-model/pre-aggregations
 [ref-extending-cubes]: /product/data-modeling/concepts/code-reusability-extending-cubes
 [ref-polymorphic-cubes]: /product/data-modeling/concepts/polymorphic-cubes
 [ref-data-blending]: /product/data-modeling/concepts/data-blending
 [ref-dynamic-data-models]: /product/data-modeling/dynamic
 [ref-proxy-dimensions]: /product/data-modeling/concepts/calculated-members#proxy-dimensions
 [ref-subquery-dimensions]: /product/data-modeling/concepts/calculated-members#subquery-dimensions
+[ref-calculated-measures]: /product/data-modeling/concepts/calculated-members#calculated-measures
 [ref-working-with-joins]: /product/data-modeling/concepts/working-with-joins
-[self-dimensions]: #dimensions
-[self-measures]: #measures
 [wiki-olap]: https://en.wikipedia.org/wiki/Online_analytical_processing
 [wiki-view-sql]: https://en.wikipedia.org/wiki/View_(SQL)
 [ref-matching-preaggs]: /product/caching/matching-pre-aggregations
@@ -744,5 +811,6 @@ Pre-Aggregations][ref-caching-preaggs-intro].
 [ref-ref-primary-key]: /reference/data-model/dimensions#primary_key
 [ref-custom-granularity-recipe]: /guides/recipes/data-modeling/custom-granularity
 [ref-proxy-granularity]: /product/data-modeling/concepts/calculated-members#time-dimension-granularity
+[ref-mls]: /product/auth/member-level-security
 [ref-ref-hierarchies]: /reference/data-model/hierarchies
 [ref-ref-folders]: /reference/data-model/view#folders
\ No newline at end of file
diff --git a/docs/pages/product/data-modeling/concepts/_meta.js b/docs/pages/product/data-modeling/concepts/_meta.js
index 5ee99fa7ed..27e102e8ed 100644
--- a/docs/pages/product/data-modeling/concepts/_meta.js
+++ b/docs/pages/product/data-modeling/concepts/_meta.js
@@ -1,5 +1,4 @@
 module.exports = {
-  "publicity": "Publicity",
   "calculated-members": "Calculated members",
   "code-reusability-extending-cubes": "Extending cubes",
   "polymorphic-cubes": "Polymorphic cubes",
diff --git a/docs/pages/product/data-modeling/concepts/code-reusability-extending-cubes.mdx b/docs/pages/product/data-modeling/concepts/code-reusability-extending-cubes.mdx
index ebb139996d..ea1d082c96 100644
--- a/docs/pages/product/data-modeling/concepts/code-reusability-extending-cubes.mdx
+++ b/docs/pages/product/data-modeling/concepts/code-reusability-extending-cubes.mdx
@@ -8,8 +8,8 @@ redirect_from:
 # Extending cubes
 
 Cube supports the [`extends` feature][ref-schema-ref-cube-extends], which allows
-you to reuse all declared members of a cube. This is a foundation for building
-reusable data models.
+you to create a cube that reuses all declared members of another cube. This is a
+foundation for building reusable data models.
 
 [Cubes][ref-schema-concepts-cubes] are represented as [JavaScript
 objects][mdn-js-objects] with such properties as measures, dimensions, and
@@ -22,6 +22,13 @@ The usual pattern is to **extract common measures, dimensions, and joins into
 the base cube** and then **extend from the base cube**. This helps to prevent
 code duplication and makes code easier to maintain and refactor.
 
+<ReferenceBox>
+
+Currently, the `extends` parameter does not pass the joins.
+Please [track this issue](https://github.com/cube-js/cube/issues/7137).
+
+</ReferenceBox>
+
 In the example below, the `base_events` cube defines the common events measures,
 dimensions, and a join to the `users` cube:
 
diff --git a/docs/pages/product/data-modeling/concepts/working-with-joins.mdx b/docs/pages/product/data-modeling/concepts/working-with-joins.mdx
index 10fa141acd..9502c4093b 100644
--- a/docs/pages/product/data-modeling/concepts/working-with-joins.mdx
+++ b/docs/pages/product/data-modeling/concepts/working-with-joins.mdx
@@ -70,7 +70,7 @@ cubes:
         sql: company
         type: string
 
-  - name: Orders
+  - name: orders
     # ...
 
     dimensions:
diff --git a/docs/pages/product/data-modeling/dynamic/jinja.mdx b/docs/pages/product/data-modeling/dynamic/jinja.mdx
index 135a60b3af..bd217ced1a 100644
--- a/docs/pages/product/data-modeling/dynamic/jinja.mdx
+++ b/docs/pages/product/data-modeling/dynamic/jinja.mdx
@@ -20,7 +20,7 @@ As a workaround, you can view the resulting data model in
 [Playground](/product/workspace/playground) and
 [Data Graph](http://localhost:3000/product/workspace/data-model#data-graph).
 You can also introspect the data model using the [`/v1/meta` REST API
-endpoint](/reference/rest-api#v1meta).
+endpoint](/product/apis-integrations/rest-api/reference#v1meta).
 
 </ReferenceBox>
 
diff --git a/docs/pages/product/data-modeling/overview.mdx b/docs/pages/product/data-modeling/overview.mdx
index b9af556b1a..a967f6f03a 100644
--- a/docs/pages/product/data-modeling/overview.mdx
+++ b/docs/pages/product/data-modeling/overview.mdx
@@ -302,7 +302,7 @@ As with other measures, `paying_percentage` can be used with dimensions.
 2.  [REST API][ref-backend-restapi]
 3.  [Data model reference documentation][ref-schema-cube]
 
-[ref-backend-restapi]: /reference/rest-api
+[ref-backend-restapi]: /product/apis-integrations/rest-api/reference
 [ref-schema-cube]: /reference/data-model/cube
 [ref-schema-measures]: /reference/data-model/measures
 [ref-schema-dimensions]: /reference/data-model/dimensions
diff --git a/docs/pages/product/deployment/cloud/byoc/_meta.js b/docs/pages/product/deployment/cloud/byoc/_meta.js
index e5908546ba..469ba96f62 100644
--- a/docs/pages/product/deployment/cloud/byoc/_meta.js
+++ b/docs/pages/product/deployment/cloud/byoc/_meta.js
@@ -1,3 +1,4 @@
 module.exports = {
   "aws": "AWS",
+  "azure": "Azure",
 }
diff --git a/docs/pages/product/deployment/cloud/byoc/azure.mdx b/docs/pages/product/deployment/cloud/byoc/azure.mdx
new file mode 100644
index 0000000000..94cb883ff0
--- /dev/null
+++ b/docs/pages/product/deployment/cloud/byoc/azure.mdx
@@ -0,0 +1,88 @@
+# Deploying Cube Cloud BYOC on Azure
+
+With Bring Your Own Cloud (BYOC) on Azure, all the components interacting with private data are deployed on
+the customer infrastructure on Azure and managed by the Cube Cloud Control Plane via the Cube Cloud Operator.
+This document provides step-by-step instructions for deploying Cube Cloud BYOC on Azure.
+
+## Overall Design
+Cube Cloud will gain access to your Azure account via the Cube Cloud Provisioner Enterprise App.
+
+It will leverage a dedicated subscription where it will create a new Resource
+Group and bootstrap all the necessary infrastructure. At the center of the BYOC
+infrastructure are two AKS clusters that provide compute resources for the Cube
+Store and all Cube deployments you configure in the Cube Cloud UI. These AKS
+clusters will have a Cube Cloud operator installed in them that is connected to
+the Cube Cloud Control Plane. The Cube Cloud Operator receives instructions
+from the Control Plane and dynamically creates or destroys all the necessary
+Kubernetes resources required to support your Cube deployments.
+
+<div style={{ textAlign: "center" }}>
+  <img
+    alt="High-level diagram of Cube Cloud resources deployed on Azure"
+    src="https://ucarecdn.com/6d0f12db-086c-4274-b165-da68ccc381a9/"
+    style={{ border: "none" }}
+    width="100%"
+  />
+</div>
+
+## Prerequisites
+
+The bulk of provisioning work will be done remotely by Cube Cloud automation.
+However, to get started, you'll need to provide Cube with the necessary access
+along with some additional information that includes:
+
+- **Azure Tenant ID** - the Entra ID of your Azure account
+- **Azure Subscription ID** - The target subscription where Cube Cloud will be granted admin permissions to provision the BYOC infrastructure
+- **Region** - The target Azure region where Cube Cloud BYOC will be installed
+
+## Provisioning access
+
+### Add Cube tenant to your organization
+
+First you should add the Cube Cloud tenant to your organization. To do this,
+open the [Azure Portal][azure-console] and go to&nbsp;<Btn>Azure Active
+Directory</Btn> →&nbsp;<Btn>External Identities</Btn> →&nbsp;<Btn>Cross-tenant
+access settings</Btn> →&nbsp;<Btn>Organizational Settings</Btn>
+→&nbsp;<Btn>Add Organization</Btn>.
+
+For Tenant ID, enter `197e5263-87f4-4ce1-96c4-351b0c0c714a`.
+
+Make sure that&nbsp;<Btn>B2B Collaboration</Btn> →&nbsp;<Btn>Inbound Access</Btn>
+→&nbsp;<Btn>Applications</Btn> is set to&nbsp;<Btn>Allows access</Btn>.
+
+### Register Cube Cloud service principal at your organization
+
+To register the Cube Cloud service principal for your organization, follow these
+steps:
+
+1.  Log in with an account that has permissions to register Enterprise
+    applications.
+2.  Open a browser tab and go to the following URL, replacing `<TENANT_ID>` with
+    your tenant ID:
+    `https://login.microsoftonline.com/<TENANT_ID>/oauth2/authorize?client_id=0c5d0d4b-6cee-402e-9a08-e5b79f199481&response_type=code&redirect_uri=https%3A%2F%2Fwww.microsoft.com%2F`
+3.  The Cube Cloud service principal has specific credentials. Check that the
+    following details match exactly what you see on the dialog box that pops up:
+
+- Client ID: `d1c59948-4d4a-43dc-8d04-c0df8795ae19`
+- Name: `cube-cloud-byoc-provisioner`
+
+Once you have confirmed that all the information is correct,
+select&nbsp;<Btn>Consent on behalf of your organization</Btn> and
+click&nbsp;<Btn>Accept</Btn>.
+
+### Grant admin permissions on your BYOC Azure Subscription to the cube-cloud-byoc-provisioner
+
+On the [Azure Portal][azure-console], go to&nbsp;<Btn>Subscriptions</Btn>
+→ _Your BYOC Subscription_ →&nbsp;<Btn>IAM</Btn>→&nbsp;<Btn>Role Assignment</Btn>
+ and assing `Contributor` and `Role Based Access Control Administrator` to the `cube-cloud-byoc-provisioner`
+ Service Principal.
+
+<Screenshot src="https://ucarecdn.com/e1e917cd-6992-4864-b20e-0fbf7688a7e5/"/>
+
+## Deployment
+
+The actual deployment will be done by Cube Cloud automation. All that's left to
+do is notify your Cube contact point that access has been granted, and pass
+along your Azure Tenant/Subscription/Region information.
+
+[azure-console]: https://portal.azure.com
diff --git a/docs/pages/product/deployment/cloud/continuous-deployment.mdx b/docs/pages/product/deployment/cloud/continuous-deployment.mdx
index cb6f10872c..91b742d6b8 100644
--- a/docs/pages/product/deployment/cloud/continuous-deployment.mdx
+++ b/docs/pages/product/deployment/cloud/continuous-deployment.mdx
@@ -34,6 +34,13 @@ First, ensure your deployment is configured to deploy with Git. Then connect
 your GitHub repository to your deployment by clicking the <Btn>Connect to
 GitHub</Btn> button, and selecting your repository.
 
+<WarningBox>
+
+If your organization uses SAML SSO for GitHub authentication, make sure to start an active SAML 
+session prior to connecting to your GitHub account from Cube.
+
+</WarningBox>
+
 <div style={{ textAlign: "center" }}>
   <img
     src="https://ucarecdn.com/3dab6d90-6bd9-44a5-ae4d-d5579a08dd89/"
diff --git a/docs/pages/product/deployment/cloud/deployments.mdx b/docs/pages/product/deployment/cloud/deployments.mdx
index 77db4c342b..d50334fe9b 100644
--- a/docs/pages/product/deployment/cloud/deployments.mdx
+++ b/docs/pages/product/deployment/cloud/deployments.mdx
@@ -50,7 +50,10 @@ and programmatic [configuration options][ref-config-options].
 
 Watch the following video to for a step-by-step walkthrough:
 
-<YouTubeVideo url="https://www.youtube.com/embed/XeaZPUQRC8M" />
+<YouTubeVideo
+  url="https://www.youtube.com/embed/XeaZPUQRC8M"
+  aspectRatio={4/2.78}
+/>
 
 Exploring the demo deployment is a great way to understand how Cube works.
 Use the [data model editor][ref-data-model] to review the data model and
@@ -59,7 +62,7 @@ make sure to run a few queries in [Playground][ref-playground].
 ## Deployment overview
 
 The&nbsp;<Btn>Overview</Btn> page of each deployment provides a high-level
-summary if its components and state:
+summary of its components and state:
 * API endpoints with URLs and connection instructions.
 * Allocated resources in line with the [deployment type][ref-deployment-types].
 * Activity log of the most recent events.
diff --git a/docs/pages/product/deployment/cloud/pricing.mdx b/docs/pages/product/deployment/cloud/pricing.mdx
index 9a1a373367..20de77c7dd 100644
--- a/docs/pages/product/deployment/cloud/pricing.mdx
+++ b/docs/pages/product/deployment/cloud/pricing.mdx
@@ -101,19 +101,34 @@ terms][ref-enterprise-premier-tier-support], and [limits][ref-cloud-limits].
 
 ## Resources
 
-The following resource types incur CCU consumption (measured in 5-minute intervals):
-
-| Resource type             | CCUs per hour                                        |
-| ------------------------- | :--------------------------------------------------: |
-| [Production Cluster][ref-production-cluster] | Depends on a [chosen tier](#deployment-tiers)           |
-| [Development Instance][ref-development-instance] | Depends on a [chosen tier](#deployment-tiers)           |
-| Cube API Instance         | Depends on a [chosen tier](#deployment-tiers)           |
-| Cube Store Worker         | Depends on a [chosen tier](#cube-store-worker-tiers) |
-| [Semantic Catalog][ref-semantic-catalog] | Depends on a [chosen tier](#semantic-catalog-tiers) |
-| [Dedicated infrastructure][ref-dedicated-infra] | 3 |
-| [Query History][ref-query-history] | Depends on a [chosen tier](#query-history-tiers)     |
-| [Monitoring Integrations][ref-monitoring-integrations] | Depends on a [chosen tier](#monitoring-integrations-tiers) |
-| [Audit Log][ref-audit-log] | Depends on a [chosen tier](#audit-log-tiers) |
+The following resource types incur CCU consumption and apply to _individual resources_
+of deployments within a Cube Cloud account. The consumption is measured in 5-minute intervals.
+
+| Resource type | CCUs per hour | Notes |
+| --- | :---: | --- |
+| [Production Cluster][ref-production-cluster] | <nobr>4..8</nobr> | Depends on a [chosen tier](#deployment-tiers) |
+| [Development Instance][ref-development-instance] | <nobr>1..2</nobr> | Depends on a [chosen tier](#deployment-tiers) |
+| Cube API Instance | <nobr>1..2</nobr> | Depends on a [chosen tier](#deployment-tiers) |
+| Cube Store Worker | <nobr>1..2</nobr> | Depends on a [chosen tier](#cube-store-worker-tiers) |
+| [Semantic Catalog][ref-semantic-catalog] | <nobr>2..4</nobr> | Depends on a [chosen tier](#semantic-catalog-tiers) |
+| [Query History][ref-query-history] | <nobr>0..20</nobr> | Depends on a [chosen tier](#query-history-tiers) |
+| [Monitoring Integrations][ref-monitoring-integrations] | <nobr>1..4</nobr> | Depends on a [chosen tier](#monitoring-integrations-tiers) |
+
+The following resource types incur CCU consumption and apply to _individual requests_
+to deployments within a Cube Cloud account:
+
+| Resource type | CCUs per request | Notes |
+| --- | :---: | --- |
+| [AI API][ref-ai-api] | <nobr>0..1</nobr> | Depends on [configuration](#ai-requests-consumption) |
+| [AI Assistant][ref-ai-assistant] | <nobr>0..1</nobr> | Depends on [configuration](#ai-requests-consumption) |
+
+The following resource types incur CCU consumption and apply to the _whole Cube Cloud
+account_:
+
+| Resource type | CCUs per hour | Notes |
+| --- | :---: | --- |
+| [Dedicated infrastructure][ref-dedicated-infra] | 3 | — |
+| [Audit Log][ref-audit-log] | <nobr>4..6</nobr> | Depends on the [chosen tier](#audit-log-tiers) |
 
 ### Deployment tiers
 
@@ -124,7 +139,7 @@ requests through [APIs & integrations][ref-apis] under the following tiers:
 | Tier | <nobr>CCUs per hour</nobr> | <nobr>CPU and memory</nobr> | Dependent features |
 | ---- | :--- | --- | --- |
 | S    | <nobr>4 — _for Production Cluster_</nobr><br/><nobr>1 — _for Development Instance_</nobr><br/><nobr>1 — _for Cube API Instance_</nobr> | 100% | — |
-| M    | <nobr>8 — _for Production Cluster_</nobr><br/><nobr>2 — _for Development Instance_</nobr><br/><nobr>2 — _for Cube API Instance_</nobr> | 200% | <nobr>[MDX API][ref-mdx-api]</nobr> |
+| M    | <nobr>8 — _for Production Cluster_</nobr><br/><nobr>2 — _for Development Instance_</nobr><br/><nobr>2 — _for Cube API Instance_</nobr> | 200% | [DAX API][ref-dax-api], [MDX API][ref-mdx-api] |
 
 You can upgrade to a chosen tier in the
 <Btn>Settings</Btn> of your deployment.
@@ -185,6 +200,16 @@ You can upgrade to a chosen tier in the
 You can [upgrade][ref-monitoring-integrations-config] to a chosen tier in the
 <Btn>Settings</Btn> of your deployment.
 
+### AI requests consumption
+
+[AI API][ref-ai-api] and [AI Assistant][ref-ai-assistant] consume CCUs per request apart from
+[Enterprise and above][cube-pricing] product tiers where customers can provide their own suitable
+LLM if wanted and then will be exempt from this charge:
+
+| <nobr>CCUs per request</nobr> |
+| :------------------------: |
+| 1                          |
+
 ### Audit Log tiers
 
 [Audit Log][ref-audit-log] collects, stores, and displays security-related events
@@ -336,7 +361,10 @@ product tier level. Payments are non-refundable.
 [ref-development-instance]: /product/deployment/cloud/deployment-types#development-instance
 [ref-apis]: /product/apis-integrations
 [ref-mdx-api]: /product/apis-integrations/mdx-api
+[ref-dax-api]: /product/apis-integrations/dax-api
 [ref-cube-store-architecture]: /product/caching/running-in-production#architecture
 [ref-data-at-rest-encryption]: /product/caching/running-in-production#data-at-rest-encryption
 [ref-customer-managed-keys]: /product/workspace/encryption-keys
-[ref-semantic-catalog]: /product/workspace/semantic-catalog
\ No newline at end of file
+[ref-semantic-catalog]: /product/workspace/semantic-catalog
+[ref-ai-api]: /product/apis-integrations/ai-api
+[ref-ai-assistant]: /product/workspace/ai-assistant
\ No newline at end of file
diff --git a/docs/pages/product/deployment/cloud/providers/azure.mdx b/docs/pages/product/deployment/cloud/providers/azure.mdx
index eb31313feb..088861e381 100644
--- a/docs/pages/product/deployment/cloud/providers/azure.mdx
+++ b/docs/pages/product/deployment/cloud/providers/azure.mdx
@@ -23,7 +23,9 @@ Cube Cloud integrates with the following [data sources](/product/configuration/d
 
 Cube Cloud integrates with the following [data visualization tools](/product/configuration/visualization-tools):
 
-- [Microsoft Power BI](https://www.microsoft.com/en-us/power-platform/products/power-bi/) via [Semantic Layer Sync](/product/apis-integrations/semantic-layer-sync)
+- [Microsoft Power BI][ref-powerbi] via the [DAX API][ref-dax-api]
+- [Microsoft Excel][ref-excel] via the [MDX API][ref-mdx-api] and
+[Cube Cloud for Excel][ref-cube-cloud-for-excel]
 
 ## Storage
 
@@ -47,4 +49,11 @@ Cube Cloud integrates with the following [data visualization tools](/product/con
 
 ## Networking
 
-[Azure Virtual Network](https://azure.microsoft.com/en-us/products/virtual-network) can be used for [secure networking](/product/deployment/cloud/vpc/azure).
\ No newline at end of file
+[Azure Virtual Network](https://azure.microsoft.com/en-us/products/virtual-network) can be used for [secure networking](/product/deployment/cloud/vpc/azure).
+
+
+[ref-powerbi]: /product/configuration/visualization-tools/powerbi
+[ref-dax-api]: /product/apis-integrations/dax-api
+[ref-excel]: /product/configuration/visualization-tools/excel
+[ref-mdx-api]: /product/apis-integrations/mdx-api
+[ref-cube-cloud-for-excel]: /product/apis-integrations/microsoft-excel
\ No newline at end of file
diff --git a/docs/pages/product/deployment/production-checklist.mdx b/docs/pages/product/deployment/production-checklist.mdx
index 1576be9317..44f03ee1c7 100644
--- a/docs/pages/product/deployment/production-checklist.mdx
+++ b/docs/pages/product/deployment/production-checklist.mdx
@@ -158,5 +158,5 @@ performance numbers can differ as it has different Cube runtime.
 [ref-schema-ref-preaggs]: /reference/data-model/pre-aggregations
 [ref-sec-ctx]: /product/auth/context
 [ref-config-jwt]: /reference/configuration/config#jwt
-[ref-api-readyz]: /reference/rest-api#readyz
-[ref-api-livez]: /reference/rest-api#livez
+[ref-api-readyz]: /product/apis-integrations/rest-api/reference#readyz
+[ref-api-livez]: /product/apis-integrations/rest-api/reference#livez
diff --git a/docs/pages/product/faqs/troubleshooting.mdx b/docs/pages/product/faqs/troubleshooting.mdx
index e3d7441f6e..caecb26fe2 100644
--- a/docs/pages/product/faqs/troubleshooting.mdx
+++ b/docs/pages/product/faqs/troubleshooting.mdx
@@ -34,8 +34,6 @@ details which will help narrow down the scope of the issue.
 If you see `has a key that already exists in Name index` message, it means that your
 multitenancy setup is missing the `pre_aggregations_schema` configuration setting in your `cube.py` file. 
 
-If you see `Error: Query execution timeout after 10 min of waiting` message, it means pre-aggregation is too large to be built.
-
 For any other error types, feel free to reach out to us in our support chat.
 
 ## Warning: There were queries in these timezones which are not added in the CUBEJS_SCHEDULED_REFRESH_TIMEZONES environment variable.
diff --git a/docs/pages/product/getting-started/core/learn-more.mdx b/docs/pages/product/getting-started/core/learn-more.mdx
index 0b0bde79ea..da38be10e8 100644
--- a/docs/pages/product/getting-started/core/learn-more.mdx
+++ b/docs/pages/product/getting-started/core/learn-more.mdx
@@ -18,7 +18,7 @@ modeling problems.
 ## Querying
 
 Cube can be queried in a variety of ways. Explore how to use
-[REST API](/reference/rest-api), [GraphQL API](/reference/graphql-api), and
+[REST API](/product/apis-integrations/rest-api), [GraphQL API](/product/apis-integrations/graphql-api), and
 [SQL API](/product/apis-integrations/sql-api), or how to
 [connect a BI or data visualization tool](/product/configuration/visualization-tools).
 
diff --git a/docs/pages/product/getting-started/core/query-data.mdx b/docs/pages/product/getting-started/core/query-data.mdx
index 10c72edd66..1b9964a01c 100644
--- a/docs/pages/product/getting-started/core/query-data.mdx
+++ b/docs/pages/product/getting-started/core/query-data.mdx
@@ -52,8 +52,8 @@ usage instructions for these APIs:
 Now that we've seen how to use Cube's APIs, let's take a look at [how to add
 pre-aggregations][next] to speed up your queries.
 
-[ref-graphql-api]: /reference/graphql-api
-[ref-rest-api]: /reference/rest-api
+[ref-graphql-api]: /product/apis-integrations/graphql-api
+[ref-rest-api]: /product/apis-integrations/rest-api
 [ref-downstream]: /product/configuration/visualization-tools
 [ref-frontend-int]: /product/apis-integrations/javascript-sdk
 [ref-sql-api]: /product/apis-integrations/sql-api
diff --git a/docs/pages/product/workspace/_meta.js b/docs/pages/product/workspace/_meta.js
index 0b05eebdbe..6e324c427c 100644
--- a/docs/pages/product/workspace/_meta.js
+++ b/docs/pages/product/workspace/_meta.js
@@ -13,7 +13,7 @@ module.exports = {
   "performance": "Performance Insights",
   "monitoring": "Monitoring Integrations",
   "access-control": "Access Control",
-  "sso": "Single Sign-on",
+  "sso": "Authentication & SSO",
   "audit-log": "Audit Log",
   "encryption-keys": "Encryption keys",
   "budgets": "Budgets",
diff --git a/docs/pages/product/workspace/audit-log.mdx b/docs/pages/product/workspace/audit-log.mdx
index f4d210c85d..46ac279aed 100644
--- a/docs/pages/product/workspace/audit-log.mdx
+++ b/docs/pages/product/workspace/audit-log.mdx
@@ -15,7 +15,10 @@ You can also choose an [Audit Log tier](/product/deployment/cloud/pricing#audit-
 Read below about [collected events](#event-types). Also, see how you can [enable](#configuration)
 Audit Log, [view events](#viewing-events), and [download](#downloading-events) them.
 
-<YouTubeVideo url="https://www.youtube.com/embed/W7hQzLS3wPc" />
+<YouTubeVideo
+  url="https://www.youtube.com/embed/W7hQzLS3wPc"
+  aspectRatio={4/2.64}
+/>
 
 ## Configuration
 
diff --git a/docs/pages/product/workspace/cli.mdx b/docs/pages/product/workspace/cli.mdx
index 7399b235c3..7ae908f814 100644
--- a/docs/pages/product/workspace/cli.mdx
+++ b/docs/pages/product/workspace/cli.mdx
@@ -57,4 +57,4 @@ location][link-athena-output] where query results are stored.
 
 [link-athena-access]: https://docs.aws.amazon.com/athena/latest/ug/access.html
 [link-athena-output]: https://docs.aws.amazon.com/athena/latest/ug/querying.html
-[ref-ref-cli]: /reference/cli
\ No newline at end of file
+[ref-ref-cli]: /product/workspace/cli/reference
\ No newline at end of file
diff --git a/docs/pages/product/workspace/cli/_meta.js b/docs/pages/product/workspace/cli/_meta.js
new file mode 100644
index 0000000000..ca8ef87b8f
--- /dev/null
+++ b/docs/pages/product/workspace/cli/_meta.js
@@ -0,0 +1,3 @@
+module.exports = {
+  "reference": "Reference"
+}
diff --git a/docs/pages/reference/cli.mdx b/docs/pages/product/workspace/cli/reference.mdx
similarity index 100%
rename from docs/pages/reference/cli.mdx
rename to docs/pages/product/workspace/cli/reference.mdx
diff --git a/docs/pages/product/workspace/integrations.mdx b/docs/pages/product/workspace/integrations.mdx
index 905f360115..be3dabe18b 100644
--- a/docs/pages/product/workspace/integrations.mdx
+++ b/docs/pages/product/workspace/integrations.mdx
@@ -12,7 +12,10 @@ The Integrations page is available in Cube Cloud on
 
 </SuccessBox>
 
-<YouTubeVideo url="https://www.youtube.com/embed/-N5dDeGqv8M" />
+<YouTubeVideo
+  url="https://www.youtube.com/embed/-N5dDeGqv8M"
+  aspectRatio={4/2.83}
+/>
 
 You can [manage integrations](#manage-integrations), connect a [specific
 tool](#connect-specific-tools), or [view API credentials](#view-api-credentials).
diff --git a/docs/pages/product/workspace/monitoring.mdx b/docs/pages/product/workspace/monitoring.mdx
index 24b3e72910..0589ac890d 100644
--- a/docs/pages/product/workspace/monitoring.mdx
+++ b/docs/pages/product/workspace/monitoring.mdx
@@ -32,7 +32,10 @@ destinations][vector-docs-sinks], also known as _sinks_.
 
 <Diagram src="https://ucarecdn.com/17dbc263-2be4-4b7d-9f34-270cd66e878b/" />
 
-<YouTubeVideo url="https://www.youtube.com/embed/iPD0axEYU6k" />
+<YouTubeVideo
+  url="https://www.youtube.com/embed/iPD0axEYU6k"
+  aspectRatio={4/2.87}
+/>
 
 ## Guides
 
diff --git a/docs/pages/product/workspace/playground.mdx b/docs/pages/product/workspace/playground.mdx
index 77a266e280..6296719e1f 100644
--- a/docs/pages/product/workspace/playground.mdx
+++ b/docs/pages/product/workspace/playground.mdx
@@ -31,6 +31,11 @@ for them, [compose](#composing-queries) a query from scratch or [paste](#pasting
 an exsiting query, view [results](#viewing-results), check a [generated
 query](#viewing-a-generated-query), or copy equivalent [queries for data APIs](#copying-api-queries).
 
+<YouTubeVideo
+  url="https://www.youtube.com/embed/4epojUSQvOU"
+  aspectRatio={4/3}
+/>
+
 ## Viewing the data model
 
 You can see a list of all cubes or views in the sidebar on the left. Choose either
diff --git a/docs/pages/product/workspace/sql-runner.mdx b/docs/pages/product/workspace/sql-runner.mdx
index eda6a5e876..5ad5079b98 100644
--- a/docs/pages/product/workspace/sql-runner.mdx
+++ b/docs/pages/product/workspace/sql-runner.mdx
@@ -35,13 +35,22 @@ and click <Btn>▶ Run</Btn>. The query results will be displayed under
   src="https://ucarecdn.com/2f910abf-5b94-43cd-87f8-14c86bd98f77/"
 />
 
-## Querying a data source vs Cube Store
+## Querying data sources
 
-The SQL Runner can run queries against any configured data sources, which is
-helpful for diagnosing database-specific issues. It can also run queries against
-Cube Store, which is useful for testing pre-aggregations directly to see if they
-return expected results. You can switch data source(s) by clicking the dropdown
-under **Data Source**:
+SQL Runner can run queries against configured data sources, which is
+helpful for diagnosing database-specific issues.
+
+<InfoBox>
+
+In order for an additional data source to show up in SQL Runner, it needs to be
+the [data source][ref-cube-datasource] in at least one cube definition.
+
+</InfoBox>
+
+It can also run queries against Cube Store, which is useful for testing
+pre-aggregations directly to see if they return expected results.
+
+You can switch data source(s) by clicking the dropdown under <Btn>Data Source</Btn>:
 
 <Screenshot
   highlight="inset(25% 60% 53% 6% round 10px)"
@@ -97,6 +106,8 @@ in a data model should be a `numeric`).
   src="https://ucarecdn.com/c2735f7c-d5e7-4b6b-903b-8d0db07b668e/"
 />
 
+
 [cubecloud-signup]: https://cubecloud.dev/auth/signup
 [ref-conf-scheduled-refresh-ctx]:
   /reference/configuration/config#scheduledrefreshcontexts
+[ref-cube-datasource]: /reference/data-model/cube#data_source
\ No newline at end of file
diff --git a/docs/pages/product/workspace/sso.mdx b/docs/pages/product/workspace/sso.mdx
index 151f6e5f77..58d99656b4 100644
--- a/docs/pages/product/workspace/sso.mdx
+++ b/docs/pages/product/workspace/sso.mdx
@@ -1,22 +1,20 @@
----
-redirect_from:
-  - /workspace/sso/
----
+# Authentication & SSO
 
-# Single Sign-on
-
-As an account administrator, you can manage how your team accesses Cube Cloud.
-There are options to log in using email and password, a GitHub account, or a
-Google account.
+As an account administrator, you can manage how your team and users access Cube Cloud.
 
+You can authenticate using email and password, a GitHub account, or a Google account.
 Cube Cloud also provides single sign-on (SSO) via identity providers supporting
-industry-proven [SAML 2.0 protocol][wiki-saml], e.g., Okta, Google Workspace,
-Azure AD, etc.
+[SAML 2.0](#saml-20), e.g., Okta, Google Workspace, Azure AD, etc.
+
+Finally, Cube Cloud provides the [LDAP integration](#ldap-integration), enabling
+users of [APIs & integrations][ref-apis] to authenticate via an LDAP catalog
+and assume roles that work with [data access policies][ref-dap] once [authentication
+integration][ref-auth-integration] is enabled.
 
 <SuccessBox>
 
-Single sign-on is available in Cube Cloud on
-[Enterprise and above](https://cube.dev/pricing) product tiers.
+Authentication is available in Cube Cloud on [all product tiers](https://cube.dev/pricing).<br/>
+[SAML 2.0](#saml-20) and [LDAP integration](#ldap-integration) are available on [Enterprise and above](https://cube.dev/pricing) product tiers.
 
 </SuccessBox>
 
@@ -25,10 +23,23 @@ Single sign-on is available in Cube Cloud on
   style="border: 0;"
 />
 
-## Guides
+## Configuration
+
+To manage authentication settings, navigate to <Btn>Team & Security</Btn> settings
+of your Cube Cloud account, and switch to the <Btn>Authentication & SSO</Btn> tab:
+
+<Screenshot src="https://ucarecdn.com/5665f017-07ff-4734-bae5-8d4984470dd7/"/>
+
+Use the toggles in <Btn>Password</Btn>, <Btn>Google</Btn>, and <Btn>GitHub</Btn>
+sections to enable or disable these authentication options.
+
+### SAML 2.0
+
+Use the toggle in the <Btn>SAML 2.0</Btn> section to enable or disable the authentication
+via an identity provider supporting the [SAML 2.0 protocol][wiki-saml].
+Once it's enabled, you'll see the <Btn>SAML 2.0 Settings</Btn> section directly below.
 
-Single sign-on works with various identity providers. Check the following guides
-to get tool-specific instructions:
+Check the following guides to get tool-specific instructions on configuration:
 
 <Grid imageSize={[56, 56]}>
   <GridItem
@@ -48,15 +59,108 @@ to get tool-specific instructions:
   />
 </Grid>
 
-## Configuration
+### LDAP integration
 
-To manage sign-in and single sign-on settings, click your user name from the
-top-right corner, navigate to <Btn>Team & Security</Btn>, and switch to
-the <Btn>Authentication & SSO</Btn> tab:
+Use the toggle in the <Btn>LDAP Integration</Btn> section to enable or disable the
+integration with an [LDAP catalog][wiki-ldap].
+Once it's enabled, you'll see the <Btn>LDAP Settings</Btn> section directly below.
 
-<Screenshot
-  alt="Cube Cloud Team Authentication and SSO tab"
-  src="https://ucarecdn.com/72248967-9b77-4a7e-970c-162b96861e4a/"
-/>
+<InfoBox>
+
+Cube Cloud will be accessing your LDAP server from the IP addresses shown under
+<Btn>LDAP Settings</Btn>. If needed, add these IP addresses to an allowlist.
+
+</InfoBox>
+
+You can configure [connection settings](#connection-settings) and use the
+<Btn>Test Connection</Btn> button to validate them. You can also configure
+[user properties](#user-properties-mapping) mapping, [user roles](#user-roles-mapping) mapping,
+and [user attributes](#user-attributes-mapping) mapping.
+
+#### Connection settings
+
+You have to configure the following connection settings:
+
+| Option | Description |
+| --- | --- |
+| <Btn>LDAP Server URL</Btn>       | Address of your LDAP server |
+| <Btn>Use Secure LDAP</Btn>       | Use an encrypted connection (LDAPS) |
+| <Btn>Don't Verify CA</Btn>       | Disable certificate authority verification |
+| <Btn>Certificate</Btn>           | Certificate for LDAPS in the PEM format |
+| <Btn>Certificate Authority</Btn> | Certificate for the private CA in the PEM format |
+| <Btn>Key</Btn>                   | Key for mutual TLS (mTLS) in the PEM format |
+| <Btn>Bind DN</Btn>               | User name for LDAP authentication |
+| <Btn>Bind Credentials</Btn>      | Password for LDAP authentication |
+| <Btn>Search Base</Btn>           | Base DN for searching users |
+| <Btn>User Object Class</Btn>     | Object class for user entries |
+
+Use the tooltips in Cube Cloud to get more information about each setting.
+
+#### User properties mapping
+
+You have to configure how user data in an LDAP catalog maps to user properties in Cube Cloud.
+The following properties are required:
+
+| Property | Description |
+| --- | --- |
+| <Btn>Login Attribute</Btn> | Login name |
+| <Btn>Id Attribute</Btn> | Unique identifier |
+| <Btn>Email Attribute</Btn> | Email address |
+| <Btn>Name Attribute</Btn> | Full name |
+
+Use the tooltips in Cube Cloud to get more information about each setting.
+
+#### User roles mapping
+
+You can configure how user data in an LDAP catalog maps to roles in Cube Cloud.
+You can also use mapped roles with [data access policies][ref-dap] once [authentication
+integration][ref-auth-integration] is enabled.
+
+Mapping is performed as follows:
+* <Btn>Roles Attribute</Btn> is retrieved from an LDAP catalog.
+* Retrieved value is transformed using rules under <Btn>Role mapping</Btn>.
+* If the value matches an existing role in Cube Cloud, then the user assumes this role.
+
+Additionally, the user always assumes the role specified under <Btn>Default Cloud role</Btn>.
+
+<Screenshot src="https://ucarecdn.com/e467faa1-bf40-4f29-998a-5ea5244610af/"/>
+
+All roles will be available under `cubeCloud.roles` array in the [security context][ref-security-context]:
+
+```json
+{
+  "cubeCloud": {
+    "roles": [
+      "Everyone",
+      "manager"
+    ]
+  }
+}
+```
+
+#### User attributes mapping
+
+You can also bring more user data from an LDAP catalog to use with [data access policies][ref-dap].
+Mapping is performed using the rules under <Btn>Attribute mapping</Btn>.
+
+All mapped attributes and their values will be available under `cubeCloud.userAttributes`
+dictionary in the [security context][ref-security-context]:
+
+```json
+{
+  "cubeCloud": {
+    "userAttributes": {
+      "fullName": "John Doe",
+      "department": "Finance",
+      "location": "San Mateo"
+    }
+  }
+}
+```
 
 [wiki-saml]: https://en.wikipedia.org/wiki/SAML_2.0
+[wiki-ldap]: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
+[ref-apis]: /product/apis-integrations
+[ref-dap]: /product/auth/data-access-policies
+[ref-security-context]: /product/auth/context
+[ref-auth-integration]: /product/auth#authentication-integration
\ No newline at end of file
diff --git a/docs/pages/product/workspace/vizard.mdx b/docs/pages/product/workspace/vizard.mdx
index 2fe4ca83ae..5627fb6bf6 100644
--- a/docs/pages/product/workspace/vizard.mdx
+++ b/docs/pages/product/workspace/vizard.mdx
@@ -14,7 +14,10 @@ Chart Prototyping is part of [Playground][ref-playground].
 To access Chart Prototyping from Playground, compose and run a query, expand
 the <Btn>Chart</Btn> pane, and click <Btn>Code</Btn> on the right:
 
-<YouTubeVideo url="https://www.youtube.com/embed/OFiJ8AVNHQw" />
+<YouTubeVideo
+  url="https://www.youtube.com/embed/OFiJ8AVNHQw"
+  aspectRatio={4/3.07}
+/>
 
 ## Preview the chart
 
diff --git a/docs/pages/reference/_meta.js b/docs/pages/reference/_meta.js
index 459786ac16..360a9e04d3 100644
--- a/docs/pages/reference/_meta.js
+++ b/docs/pages/reference/_meta.js
@@ -2,11 +2,5 @@ module.exports = {
   "configuration": "Configuration",
   "data-model": "Data modeling",
   "python": "Python packages",
-  "sql-api": "SQL API",
-  "rest-api": "REST API",
-  "graphql-api": "GraphQL API",
-  "ai-api": "AI API",
-  "frontend": "JavaScript SDK",
-  "cli": "CLI",
   "errors": "Error messages"
 }
\ No newline at end of file
diff --git a/docs/pages/reference/configuration/config.mdx b/docs/pages/reference/configuration/config.mdx
index b9abd79237..883aaf4013 100644
--- a/docs/pages/reference/configuration/config.mdx
+++ b/docs/pages/reference/configuration/config.mdx
@@ -52,8 +52,6 @@ environment variable. The default value is `model`.
 Use [`repositoryFactory`][self-repofactory] for [multitenancy][ref-multitenancy]
 or when a more flexible setup is needed.
 
-{/* TODO: https://cubedevinc.atlassian.net/browse/CC-3095 */}
-
 ### `context_to_app_id`
 
 It's a [multitenancy][ref-multitenancy] option.
@@ -890,7 +888,7 @@ environment variable, this option is enabled as well for the best user experienc
 
 ### `base_path`
 
-The base path for the [REST API](/reference/rest-api).
+The base path for the [REST API](/product/apis-integrations/rest-api/reference).
 
 <CodeTabs>
 
@@ -1308,11 +1306,64 @@ module.exports = {
 
 </CodeTabs>
 
+### `context_to_roles`
+
+Used by [data access policies][ref-dap]. This option is used to derive a list of
+[data access roles][ref-dap-roles] from the [security context][ref-sec-ctx].
+
+<CodeTabs>
+
+```python
+from cube import config
+
+@config('context_to_roles')
+def context_to_roles(ctx: dict) -> list[str]:
+  return ctx['securityContext'].get('roles', ['default'])
+```
+
+```javascript
+
+module.exports = {
+  contextToRoles: ({ securityContext }) => {
+    return securityContext.roles || ['default']
+  }
+}
+```
+
+</CodeTabs>
+
+If the [user roles mapping][ref-ldap-roles-mapping] in the [LDAP integration][ref-ldap-integration]
+is configured and the [authentication integration][ref-auth-integration] is enabled,
+the `context_to_roles` option might be defined as follows:
+
+<CodeTabs>
+
+```python
+from cube import config
+
+@config('context_to_roles')
+def context_to_roles(ctx: dict) -> list[str]:
+  cloud_ctx = ctx['securityContext'].get('cloud', {'roles': []})
+  return cloud_ctx.get('roles', [])
+```
+
+```javascript
+
+module.exports = {
+  contextToRoles: ({ securityContext }) => {
+    const cloud_ctx = securityContext.cloud || { roles: [] }
+    return cloud_ctx.roles || []
+  }
+}
+```
+
+</CodeTabs>
+
 ## Utility
 
 ### `logger`
 
-A function to server as a custom logger.
+A function to define a custom logger.
 
 Accepts the following arguments:
 - `message`: the message to be logged
@@ -1408,7 +1459,7 @@ If not defined, Cube will lookup for environment variable
 [link-wiki-tz]: https://en.wikipedia.org/wiki/Tz_database
 [ref-development-mode]: /product/configuration#development-mode
 [ref-multitenancy]: /product/configuration/advanced/multitenancy
-[ref-rest-api]: /reference/rest-api
+[ref-rest-api]: /product/apis-integrations/rest-api
 [ref-sql-api]: /product/apis-integrations/sql-api
 [ref-pre-aggregations-refresh-key]:
   /reference/data-model/pre-aggregations#refresh_key
@@ -1439,4 +1490,9 @@ If not defined, Cube will lookup for environment variable
 [link-snake-case]: https://en.wikipedia.org/wiki/Snake_case
 [link-camel-case]: https://en.wikipedia.org/wiki/Camel_case
 [link-github-cube-drivers]: https://github.com/cube-js/cube/tree/master/packages
-[ref-ungrouped-query]: /product/apis-integrations/queries#ungrouped-query
\ No newline at end of file
+[ref-ungrouped-query]: /product/apis-integrations/queries#ungrouped-query
+[ref-dap]: /product/auth/data-access-policies
+[ref-dap-roles]: /product/auth/data-access-policies#data-access-roles
+[ref-auth-integration]: /product/auth#authentication-integration
+[ref-ldap-roles-mapping]: /product/workspace/sso#user-roles-mapping
+[ref-ldap-integration]: /product/workspace/sso#ldap-integration
\ No newline at end of file
diff --git a/docs/pages/reference/data-model/_meta.js b/docs/pages/reference/data-model/_meta.js
index 781d8f47f4..66735c5ec4 100644
--- a/docs/pages/reference/data-model/_meta.js
+++ b/docs/pages/reference/data-model/_meta.js
@@ -7,6 +7,7 @@ module.exports = {
   "segments": "Segments",
   "joins": "Joins",
   "pre-aggregations": "Pre-aggregations",
+  "data-access-policies": "Data access policies",
   "types-and-formats": "Types and formats",
   "context-variables": "Context variables"
 }
\ No newline at end of file
diff --git a/docs/pages/reference/data-model/cube.mdx b/docs/pages/reference/data-model/cube.mdx
index 24ee25cd3a..c367aa0ba1 100644
--- a/docs/pages/reference/data-model/cube.mdx
+++ b/docs/pages/reference/data-model/cube.mdx
@@ -12,7 +12,7 @@ Cubes are typically declared in separate files with one cube per file.
 Within each cube are definitions of [measures][ref-ref-measures],
 [dimensions][ref-ref-dimensions], [hierarchies][ref-ref-hierarchies],
 [segments][ref-ref-segments], [joins][ref-ref-joins] between cubes,
-and [pre-aggregations][ref-ref-pre-aggs].
+[pre-aggregations][ref-ref-pre-aggs], and [data access policies][ref-ref-dap].
 
 <CodeTabs>
 
@@ -110,88 +110,31 @@ cubes:
 
 </CodeTabs>
 
-### `data_source`
+### `sql_alias`
 
-Each cube can have its own `data_source` name to support scenarios where data
-should be fetched from multiple databases. The value of the `data_source`
-parameter will be passed to the [`driverFactory()`][ref-config-driverfactory]
-function as part of the `context` parameter. By default, each cube has a
-`default` value for its `data_source`; to override it you can use:
+Use `sql_alias` when auto-generated cube alias prefix is too long and truncated
+by databases such as Postgres:
 
 <CodeTabs>
 
 ```javascript
-cube(`order_facts`, {
-  data_source: `prod_db`,
+cube(`order_facts_about_literally_everything_in_the_world`, {
   sql_table: `orders`,
+  sql_alias: `order_facts`,
 });
 ```
 
 ```yaml
 cubes:
-  - name: order_facts
-    data_source: prod_db
+  - name: order_facts_about_literally_everything_in_the_world
     sql_table: orders
+    sql_alias: order_facts
 ```
 
 </CodeTabs>
 
-### `description`
-
-This parameter provides a human-readable description of a cube.
-When applicable, it will be displayed in [Playground][ref-playground] and exposed
-to data consumers via [APIs and integrations][ref-apis].
-
-A description can give a hint both to your team and end users, making sure they
-interpret the data correctly. 
-
-<CodeTabs>
-
-```javascript
-cube(`orders`, {
-  sql_table: `orders`,
-  title: `Product Orders`,
-  description: `All orders-related information`,
-});
-```
-
-```yaml
-cubes:
-  - name: orders
-    sql_table: orders
-    title: Product Orders
-    description: All orders-related information
-```
-
-</CodeTabs>
-
-### `meta`
-
-Custom metadata. Can be used to pass any information to the frontend.
-
-<CodeTabs>
-
-```javascript
-cube(`orders`, {
-  sql_table: `orders`,
-  title: `Product Orders`,
-  meta: {
-    any: `value`
-  }
-});
-```
-
-```yaml
-cubes:
-  - name: orders
-    sql_table: orders
-    title: Product Orders
-    meta:
-      any: value
-
-```
-
-</CodeTabs>
+It'll generate aliases for members such as `order_facts__count`. `sql_alias` affects
+all member names including pre-aggregation table names.
 
 ### `extends`
 
@@ -276,6 +219,151 @@ cube(`extended_order_facts`, {
 });
 ```
 
+### `data_source`
+
+Each cube can have its own `data_source` name to support scenarios where data
+should be fetched from multiple databases. The value of the `data_source`
+parameter will be passed to the [`driverFactory()`][ref-config-driverfactory]
+function as part of the `context` parameter. By default, each cube has a
+`default` value for its `data_source`; to override it you can use:
+
+<CodeTabs>
+
+```javascript
+cube(`order_facts`, {
+  data_source: `prod_db`,
+  sql_table: `orders`,
+});
+```
+
+```yaml
+cubes:
+  - name: order_facts
+    data_source: prod_db
+    sql_table: orders
+```
+
+</CodeTabs>
+
+### `sql`
+
+The `sql` parameter specifies the SQL that will be used to generate a table that
+will be queried by a cube. It can be any valid SQL query, but usually it takes
+the form of a `SELECT * FROM my_table` query. Please note that you don't need to
+use `GROUP BY` in a SQL query on the cube level. This query should return a
+plain table, without aggregations.
+
+<CodeTabs>
+
+```javascript
+cube(`orders`, {
+  sql: `SELECT * FROM orders`,
+});
+```
+
+```yaml
+cubes:
+  - name: orders
+    sql: SELECT * FROM orders
+```
+
+</CodeTabs>
+
+With JavaScript models, you can also reference other cubes' SQL statements for
+code reuse:
+
+```javascript
+cube(`companies`, {
+  sql: `
+    SELECT users.company_name, users.company_id
+    FROM ${users.sql()} AS users
+  `,
+});
+```
+
+It is recommended to prefer the [`sql_table`](#parameters-sql-table) parameter
+over the `sql` parameter for all cubes that are supposed to use queries like
+this: `SELECT * FROM table`.
+
+### `sql_table`
+
+The `sql_table` parameter is used as a concise way for defining a cube that uses
+a query like this: `SELECT * FROM table`. Instead of using the
+[`sql`](#parameters-sql) parameter, use `sql_table` with the table name that this
+cube will query.
+
+<CodeTabs>
+
+```javascript
+cube(`orders`, {
+  sql_table: `public.orders`,
+});
+```
+
+```yaml
+cubes:
+  - name: orders
+    sql_table: public.orders
+```
+
+</CodeTabs>
+
+### `title`
+
+Use `title` to change the display name of the cube. By default, Cube will
+humanize the cube's name, so for instance, `users_orders` would become
+`Users Orders`. If default humanizing doesn't work in your case, please use the
+title parameter. It is highly recommended to give human readable names to your
+cubes. It will help everyone on a team better understand the data structure and
+will help maintain a consistent set of definitions across an organization.
+
+<CodeTabs>
+
+```javascript
+cube(`orders`, {
+  sql_table: `orders`,
+  title: `Product Orders`,
+});
+```
+
+```yaml
+cubes:
+  - name: orders
+    sql_table: orders
+    title: Product Orders
+```
+
+</CodeTabs>
+
+### `description`
+
+This parameter provides a human-readable description of a cube.
+When applicable, it will be displayed in [Playground][ref-playground] and exposed
+to data consumers via [APIs and integrations][ref-apis].
+
+A description can give a hint both to your team and end users, making sure they
+interpret the data correctly. 
+
+<CodeTabs>
+
+```javascript
+cube(`orders`, {
+  sql_table: `orders`,
+  title: `Product Orders`,
+  description: `All orders-related information`,
+});
+```
+
+```yaml
+cubes:
+  - name: orders
+    sql_table: orders
+    title: Product Orders
+    description: All orders-related information
+```
+
+</CodeTabs>
+
 ### `public`
 
 The `public` parameter is used to manage the visibility of a cube. Valid values
@@ -318,7 +406,7 @@ The default values for `refresh_key` are
 Refresh key of a query is a concatenation of all cubes refresh keys involved in
 query. For rollup queries pre-aggregation table name is used as a refresh key.
 
-You can set up a custom refresh check SQL by changing `refresh_key` property.
+You can set up a custom refresh check SQL by changing the `refresh_key` parameter.
 Often, a `MAX(updated_at_timestamp)` for OLTP data is a viable option, or
 examining a metadata table for whatever system is managing the data to see when
 it last ran. timestamp in that case.
@@ -374,7 +462,7 @@ cubes:
 
 `every` - can be set as an interval with granularities `second`, `minute`,
 `hour`, `day`, and `week` or accept CRON string with some limitations. If you
-set `every` as CRON string, you can use the `timezone` property.
+set `every` as CRON string, you can use the `timezone` parameter.
 
 For example:
 
@@ -462,121 +550,61 @@ SELECT FLOOR(EXTRACT(EPOCH FROM NOW()) / 5)
 └───────────────────────── second (0 - 59, optional)
 ```
 
-### `sql`
+### `meta`
 
-The `sql` parameter specifies the SQL that will be used to generate a table that
-will be queried by a cube. It can be any valid SQL query, but usually it takes
-the form of a `SELECT * FROM my_table` query. Please note that you don't need to
-use `GROUP BY` in a SQL query on the cube level. This query should return a
-plain table, without aggregations.
+Custom metadata. Can be used to pass any information to the frontend.
 
 <CodeTabs>
 
 ```javascript
 cube(`orders`, {
-  sql: `SELECT * FROM orders`,
+  sql_table: `orders`,
+  title: `Product Orders`,
+  meta: {
+    any: `value`
+  }
 });
 ```
 
 ```yaml
 cubes:
   - name: orders
-    sql: SELECT * FROM orders
-```
-
-</CodeTabs>
-
-With JavaScript models, you can also reference other cubes' SQL statements for
-code reuse:
-
-```javascript
-cube(`companies`, {
-  sql: `
-    SELECT users.company_name, users.company_id
-    FROM ${users.sql()} AS users
-  `,
-});
-```
-
-It is recommended to prefer the [`sql_table`](#parameters-sql-table) property
-over the `sql` property for all cubes that are supposed to use queries like
-this: `SELECT * FROM table`.
-
-### `sql_table`
-
-The `sql_table` property is used as a concise way for defining a cube that uses
-a query like this: `SELECT * FROM table`. Instead of using the
-[`sql`](#parameters-sql) property, use `sql_table` with the table name that this
-cube will query.
-
-<CodeTabs>
-
-```javascript
-cube(`orders`, {
-  sql_table: `public.orders`,
-});
-```
+    sql_table: orders
+    title: Product Orders
+    meta:
+      any: value
 
-```yaml
-cubes:
-  - name: orders
-    sql_table: public.orders
 ```
 
 </CodeTabs>
 
-### `sql_alias`
+### `pre_aggregations`
 
-Use `sql_alias` when auto-generated cube alias prefix is too long and truncated
-by DB such as Postgres:
+The `pre_aggregations` parameter is used to configure [pre-aggregations][ref-ref-pre-aggs].
 
-<CodeTabs>
+### `joins`
 
-```javascript
-cube(`order_facts`, {
-  sql_table: `orders`,
-  sql_alias: `ofacts`,
-});
-```
+The `joins` parameter is used to configure [joins][ref-ref-joins].
 
-```yaml
-cubes:
-  - name: order_facts
-    sql_table: orders
-    sql_alias: ofacts
-```
+### `dimensions`
 
-</CodeTabs>
+The `dimensions` parameter is used to configure [dimensions][ref-ref-dimensions].
 
-It'll generate aliases for members such as `ofacts__count`. `sql_alias` affects
-all member names including pre-aggregation table names.
+### `hierarchies`
 
-### `title`
+The `hierarchies` parameter is used to configure [hierarchies][ref-ref-hierarchies].
 
-Use `title` to change the display name of the cube. By default, Cube will
-humanize the cube's name, so for instance, `users_orders` would become
-`Users Orders`. If default humanizing doesn't work in your case, please use the
-title parameter. It is highly recommended to give human readable names to your
-cubes. It will help everyone on a team better understand the data structure and
-will help maintain a consistent set of definitions across an organization.
+### `segments`
 
-<CodeTabs>
+The `segments` parameter is used to configure [segments][ref-ref-segments].
 
-```javascript
-cube(`orders`, {
-  sql_table: `orders`,
-  title: `Product Orders`,
-});
-```
+### `measures`
 
-```yaml
-cubes:
-  - name: orders
-    sql_table: orders
-    title: Product Orders
-```
+The `measures` parameter is used to configure [measures][ref-ref-measures].
 
-</CodeTabs>
+### `access_policy`
+
+The `access_policy` parameter is used to configure [data access policies][ref-ref-dap].
 
 
 [ref-config-driverfactory]: /reference/configuration/config#driverfactory
@@ -586,8 +614,8 @@ cubes:
 [ref-dev-playground]: /product/workspace/playground
 [ref-recipe-control-access-cubes-views]:
   /guides/recipes/access-control/controlling-access-to-cubes-and-views
-[ref-restapi-meta]: /reference/rest-api#v1meta
-[ref-restapi-sql]: /reference/rest-api#v1sql
+[ref-restapi-meta]: /product/apis-integrations/rest-api/reference#v1meta
+[ref-restapi-sql]: /product/apis-integrations/rest-api/reference#v1sql
 [ref-sec-ctx]: /product/auth/context
 [ref-naming]: /product/data-modeling/syntax#naming
 [ref-playground]: /product/workspace/playground
@@ -598,3 +626,4 @@ cubes:
 [ref-ref-segments]: /reference/data-model/segments
 [ref-ref-joins]: /reference/data-model/joins
 [ref-ref-pre-aggs]: /reference/data-model/pre-aggregations
+[ref-ref-dap]: /reference/data-model/data-access-policies
\ No newline at end of file
diff --git a/docs/pages/reference/data-model/data-access-policies.mdx b/docs/pages/reference/data-model/data-access-policies.mdx
new file mode 100644
index 0000000000..b5d699155c
--- /dev/null
+++ b/docs/pages/reference/data-model/data-access-policies.mdx
@@ -0,0 +1,366 @@
+# Data access policies
+
+You can use the `access_policy` parameter within [cubes][ref-ref-cubes] and [views][ref-ref-views]
+to configure [data access policies][ref-dap] for them.
+
+## Parameters
+
+The `access_policy` parameter should define a list of access policies. Each policy
+can be configured using the following parameters:
+
+- [`role`](#role) defines which [data access role][ref-dap-roles] a policy applies
+to.
+- [`conditions`](#conditions) can be optionally used to specify when a policy
+takes effect.
+- [`member_level`](#member-level) and [`row_level`](#row-level) parameters are used
+to configure [member-level][ref-dap-mls] and [row-level][ref-dap-rls] access.
+
+### `role`
+
+The `role` parameter defines which [data access role][ref-dap-roles], as defined
+by the [`context_to_roles`][ref-context-to-roles] configuration parameter, a
+policy applies to. To define a policy that applies to all users regardless of
+their roles, use the _any role_ shorthand: `role: "*"`.
+
+In the following example, three access policies are defined, with the first one
+applying to all users and two other applying to users with `marketing` or
+`finance` roles, respectively.
+
+<CodeTabs>
+
+```yaml
+cubes:
+  - name: orders
+    # ...
+
+    access_policy:
+        # Applies to any role
+      - role: "*"
+        # ...
+
+      - role: marketing
+        # ...
+
+      - role: finance
+        # ...
+```
+
+```javascript
+cube(`orders`, {
+  // ...
+
+  access_policy: [
+    {
+      // Applies to any role
+      role: `*`,
+      // ...
+    },
+    {
+      role: `marketing`,
+      // ...
+    },
+    {
+      role: `finance`,
+      // ...
+    }
+  ]
+})
+```
+
+</CodeTabs>
+
+### `conditions`
+
+The optional `conditions` parameter, when present, defines a list of conditions
+that should all be `true` in order for a policy to take effect. Each condition is
+configured with an `if` parameter that is expected to reference the [security
+context][ref-sec-ctx].
+
+In the following example, a permissive policy for all roles will only apply to
+EMEA-based users, as determined by the `is_EMEA_based` attribute in the security
+context:
+
+<CodeTabs>
+
+```yaml
+cubes:
+  - name: orders
+    # ...
+
+    access_policy:
+      - role: "*"
+        conditions:
+          - if: "{ securityContext.is_EMEA_based }"
+        member_level:
+          includes: "*"
+```
+
+```javascript
+cube(`orders`, {
+  // ...
+
+  access_policy: [
+    {
+      role: `*`,
+      conditions: [
+        { if: securityContext.is_EMEA_based }
+      ],
+      member_level: {
+        includes: `*`
+      }
+    }
+  ]
+})
+```
+
+</CodeTabs>
+
+You can use the `conditions` parameter to define multiple policies for the same
+role.
+
+In the following example, the first policy provides access to a _subset of members_
+to managers who are full-time employees while the other one provides access to
+_all members_ to managers who are full-time employees and have also completed a
+data privacy training:
+
+<CodeTabs>
+
+```yaml
+cubes:
+  - name: orders
+    # ...
+
+    access_policy:
+      - role: manager
+        conditions:
+          - if: "{ securityContext.is_full_time_employee }"
+        member_level:
+          includes:
+            - status
+            - count
+
+      - role: manager
+        conditions:
+          - if: "{ securityContext.is_full_time_employee }"
+          - if: "{ securityContext.has_completed_privacy_training }"
+        member_level:
+          includes: "*"
+```
+
+```javascript
+cube(`orders`, {
+  // ...
+
+  access_policy: [
+    {
+      role: `manager`,
+      conditions: [
+        { if: securityContext.is_full_time_employee }
+      ],
+      member_level: {
+        includes: [
+          `status`,
+          `count`
+        ]
+      }
+    },
+    {
+      role: `manager`,
+      conditions: [
+        { if: securityContext.is_full_time_employee },
+        { if: securityContext.has_completed_privacy_training }
+      ],
+      member_level: {
+        includes: `*`
+      }
+    }
+  ]
+})
+```
+
+</CodeTabs>
+
+### `member_level`
+
+The optional `member_level` parameter, when present, configures [member-level
+access][ref-dap-mls] for a policy by specifying allowed or disallowed members.
+
+You can either provide a list of allowed members with the `includes` parameter,
+or a list of disallowed members with the `excludes` parameter. There's also the
+_all members_ shorthand for both of these paramaters: `includes: "*"`, `excludes: "*"`.
+
+In the following example, member-level access is configured this way:
+
+| Scope | Access |
+| --- | --- |
+| Users with the `manager` role | All members except for `count` |
+| Users with the `observer` role | All members except for `count` and `count_7d` |
+| Users with the `guest` role | Only the `count_30d` measure |
+| All other users | No access to this cube at all |
+
+<CodeTabs>
+
+```yaml
+cubes:
+  - name: orders
+    # ...
+    
+    access_policy:
+      - role: "*"
+        member_level:
+          # Includes nothing, i.e., excludes all members
+          includes: []
+      
+      - role: manager
+        member_level:
+          # Includes all members except for `count`
+          excludes:
+            - count
+      
+      - role: observer
+        member_level:
+          # Includes all members except for `count` and `count_7d`
+          excludes:
+            - count
+            - count_7d
+      
+      - role: guest
+        # Includes only `count_30d`, excludes all other members
+        member_level:
+          includes:
+            - count_30d
+```
+
+```javascript
+cube(`orders`, {
+  // ...
+
+  access_policy: [
+    {
+      role: `*`,
+      // Includes nothing, i.e., excludes all members
+      member_level: {
+        includes: []
+      }
+    },
+    {
+      role: `manager`,
+      // Includes all members except for `count`
+      member_level: {
+        excludes: [
+          `count`
+        ]
+      }
+    },
+    {
+      role: `observer`,
+      // Includes all members except for `count` and `count_7d`
+      member_level: {
+        excludes: [
+          `count`,
+          `count_7d`
+        ]
+      }
+    },
+    {
+      role: `guest`,
+      // Includes only `count_30d`, excludes all other members
+      member_level: {
+        includes: [
+          `count_30d`
+        ]
+      }
+    }
+  ]
+})
+```
+
+</CodeTabs>
+
+Note that access policies also respect [member-level security][ref-mls] restrictions
+configured via `public` parameters. See [member-level access][ref-dap-mls] to
+learn more about policy evaluation.
+
+### `row_level`
+
+The optional `row_level` parameter, when present, configures [row-level
+access][ref-dap-rls] for a policy by specifying `filters` that should apply to result set rows.
+You can also use the optional `allow_all` parameter to explicitly allow or disallow all rows.
+
+In the following example, users with the `manager` role are allowed to access only
+rows that have the `state` dimension matching the state from the [security context][ref-sec-ctx].
+All other users are disallowed from accessing any rows at all.
+
+<CodeTabs>
+
+```yaml
+cubes:
+  - name: orders
+    # ...
+    
+    access_policy:
+      - role: "*"
+        row_level:
+          allow_all: false
+      
+      - role: manager
+        row_level:
+          filters:
+            - member: state
+              operator: equals
+              values: [ "{ securityContext.state }" ]
+```
+
+```javascript
+cube(`orders`, {
+  // ...
+
+  access_policy: [
+    {
+      role: `*`,
+      row_level: {
+        allow_all: false
+      }
+    },
+    {
+      role: `manager`,
+      row_level: {
+        filters: [
+          {
+            member: `state`,
+            operator: `equals`,
+            values: [ securityContext.state ]
+          }
+        ]
+      }
+    }
+  ]
+})
+```
+
+</CodeTabs>
+
+For convenience, row filters are configured using the same format as [filters in
+REST API][ref-rest-query-filters] queries, allowing to use the same set of
+[filter operators][ref-rest-query-ops], e.g., `equals`, `contains`, `gte`, etc.
+You can also use `and` and `or` parameters to combine multiple filters into
+[boolean logical operators][ref-rest-boolean-ops].
+
+Note that access policies also respect [row-level security][ref-rls] restrictions
+configured via the `query_rewrite` configuration option. See [row-level access][ref-dap-rls] to
+learn more about policy evaluation.
+
+
+[ref-ref-cubes]: /reference/data-model/cube
+[ref-ref-views]: /reference/data-model/view
+[ref-dap]: /product/auth/data-access-policies
+[ref-dap-roles]: /product/auth/data-access-policies#data-access-roles
+[ref-dap-mls]: /product/auth/data-access-policies#member-level-access
+[ref-dap-rls]: /product/auth/data-access-policies#row-level-access
+[ref-context-to-roles]: /reference/configuration/config#context_to_roles
+[ref-mls]: /product/auth/member-level-security
+[ref-rls]: /product/auth/row-level-security
+[ref-sec-ctx]: /product/auth/context
+[ref-rest-query-filters]: /product/apis-integrations/rest-api/query-format#filters-format
+[ref-rest-query-ops]: /product/apis-integrations/rest-api/query-format#filters-operators
+[ref-rest-boolean-ops]: /product/apis-integrations/rest-api/query-format#boolean-logical-operators
\ No newline at end of file
diff --git a/docs/pages/reference/data-model/dimensions.mdx b/docs/pages/reference/data-model/dimensions.mdx
index 7c35bb0989..cdeee806f3 100644
--- a/docs/pages/reference/data-model/dimensions.mdx
+++ b/docs/pages/reference/data-model/dimensions.mdx
@@ -6,11 +6,11 @@ redirect_from:
 
 # Dimensions
 
-The `dimensions` property contains a set of dimensions. You can think about a
-dimension as an attribute related to a measure, e.g. the measure `user_count`
+You can use the `dimensions` parameter within [cubes][ref-ref-cubes] to define dimensions.
+You can think about a dimension as an attribute related to a measure, e.g. the measure `user_count`
 can have dimensions like `country`, `age`, `occupation`, etc.
 
-Any dimension should have the following parameters: `name`, `sql` and `type`.
+Any dimension should have the following parameters: [`name`](#name), [`sql`](#sql), and [`type`](#type).
 
 Dimensions can be also organized into [hierarchies][ref-ref-hierarchies].
 
@@ -699,6 +699,7 @@ cube(`orders`, {
 </CodeTabs>
 
 
+[ref-ref-cubes]: /reference/data-model/cube
 [ref-schema-ref-joins]: /reference/data-model/joins
 [ref-subquery]: /product/data-modeling/concepts/calculated-members#subquery-dimensions
 [self-subquery]: #sub-query
diff --git a/docs/pages/reference/data-model/hierarchies.mdx b/docs/pages/reference/data-model/hierarchies.mdx
index 92212b4938..8f7313ecd9 100644
--- a/docs/pages/reference/data-model/hierarchies.mdx
+++ b/docs/pages/reference/data-model/hierarchies.mdx
@@ -1,7 +1,7 @@
 # Hierarchies
 
-The `hierarchies` property contains a set of hierarchies. You can think about a
-hierarchy as a means to group [dimensions][ref-ref-dimensions] together and organize
+You can use the `hierarchies` parameter within [cubes][ref-ref-cubes] to define hierarchies.
+You can think about a hierarchy as a means to group [dimensions][ref-ref-dimensions] together and organize
 them into levels of granularity, allowing users to drill down or roll up for analysis.
 
 <InfoBox>
@@ -14,6 +14,11 @@ You can also preview hierarchies in [Playground][ref-playground].
 
 Any hierarchy should have the following parameters: [`name`](#name) and [`levels`](#levels).
 
+<YouTubeVideo
+  url="https://www.youtube.com/embed/Y5E6DmH_Hz4"
+  aspectRatio={4/3}
+/>
+
 ## Parameters
 
 ### `name`
@@ -298,8 +303,9 @@ cubes:
 </CodeTabs>
 
 
+[ref-ref-cubes]: /reference/data-model/cube
 [ref-ref-dimensions]: /reference/data-model/dimensions
 [ref-naming]: /product/data-modeling/syntax#naming
-[ref-apis-support]: /product/apis-integrations#support-for-data-modeling
+[ref-apis-support]: /product/apis-integrations#data-modeling
 [ref-playground]: /product/workspace/playground#viewing-the-data-model
 [ref-viz-tools]: /product/configuration/visualization-tools
\ No newline at end of file
diff --git a/docs/pages/reference/data-model/joins.mdx b/docs/pages/reference/data-model/joins.mdx
index defb03fa38..dab74c78ef 100644
--- a/docs/pages/reference/data-model/joins.mdx
+++ b/docs/pages/reference/data-model/joins.mdx
@@ -6,9 +6,8 @@ redirect_from:
 
 # Joins
 
-The `joins` parameter declares a block to define relationships between cubes. It
-allows users to access and compare fields from two or more cubes at the same
-time.
+You can use the `joins` parameter within [cubes][ref-ref-cubes] to define joins to other cubes.
+Joins allow to access and compare members from two or more cubes at the same time.
 
 <CodeTabs>
 
@@ -664,6 +663,8 @@ In case there are multiple join paths that can be used to join the same set of c
 Cube makes join trees as predictable and stable as possible, but this isn't guaranteed in case multiple join paths exist.
 Please use views to address join predictability and stability.
 
+
+[ref-ref-cubes]: /reference/data-model/cube
 [ref-restapi-query-filter-op-set]:
   /product/apis-integrations/rest-api/query-format#set
 [ref-schema-fundamentals-join-dir]:
@@ -675,4 +676,4 @@ Please use views to address join predictability and stability.
 [wiki-djikstra-alg]: https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm
 [wiki-left-join]: https://en.wikipedia.org/wiki/Join_(SQL)#Left_outer_join
 [wiki-1-1]: https://en.wikipedia.org/wiki/One-to-one_(data_model)
-[wiki-1-m]: https://en.wikipedia.org/wiki/One-to-many_(data_model)
+[wiki-1-m]: https://en.wikipedia.org/wiki/One-to-many_(data_model)
\ No newline at end of file
diff --git a/docs/pages/reference/data-model/measures.mdx b/docs/pages/reference/data-model/measures.mdx
index 64d378c23a..96ff9eb2ba 100644
--- a/docs/pages/reference/data-model/measures.mdx
+++ b/docs/pages/reference/data-model/measures.mdx
@@ -6,10 +6,10 @@ redirect_from:
 
 # Measures
 
-The `measures` parameter contains a set of measures and each measure is an
-aggregation over a certain column in your database table.
+You can use the `measures` parameter within [cubes][ref-ref-cubes] to define measures.
+Each measure is an aggregation over a certain column in your database table.
 
-Any measure should have the following parameters: `name`, `sql` and `type`.
+Any measure should have the following parameters: [`name`](#name), [`sql`](#sql), and [`type`](#type).
 
 ## Parameters
 
@@ -527,6 +527,7 @@ You can create calculated measures from several joined cubes. In this case, a
 join will be created automatically.
 
 
+[ref-ref-cubes]: /reference/data-model/cube
 [ref-schema-ref-types-formats-measures-types]:
   /reference/data-model/types-and-formats#measure-types
 [ref-schema-ref-types-formats-measures-formats]:
diff --git a/docs/pages/reference/data-model/pre-aggregations.mdx b/docs/pages/reference/data-model/pre-aggregations.mdx
index abea423da8..eb18db356a 100644
--- a/docs/pages/reference/data-model/pre-aggregations.mdx
+++ b/docs/pages/reference/data-model/pre-aggregations.mdx
@@ -6,8 +6,8 @@ redirect_from:
 
 # Pre-aggregations
 
-[Pre-aggregations][ref-pre-aggs] can be defined using the `pre_aggregations`
-parameter of a [cube][ref-ref-cubes].
+You can use the `pre_aggregations` parameter within [cubes][ref-ref-cubes] to define
+[pre-aggregations][ref-pre-aggs].
 
 Pre-aggregations must have, at minimum, a [name](#name) and a [type](#type).
 Pre-aggregations must include all dimensions and measures you will query with.
@@ -1111,8 +1111,12 @@ refreshes.
 ### `allow_non_strict_date_range_match`
 
 The `allow_non_strict_date_range_match` property can be used to allow queries to
-match this pre-aggregation when using non-strict date ranges. This is useful
-when using a visualization tools such as [Apache
+match this pre-aggregation when using non-strict date ranges.
+By default Cube checks if requested date range exactly matches pre-aggregation granularity.
+For example if you're requesting half of a day or your date range filter is just one millisecond off for daily granularity pre-aggregation Cube would not use such a pre-aggregation by default.
+Use this flag to lift this strict check.
+This is useful
+when using a visualization tools such as Tableau or [Apache
 Superset][ref-config-downstream-superset] that use loose date ranges by default.
 
 <CodeTabs>
diff --git a/docs/pages/reference/data-model/segments.mdx b/docs/pages/reference/data-model/segments.mdx
index 2c074f5aad..e9a903a47f 100644
--- a/docs/pages/reference/data-model/segments.mdx
+++ b/docs/pages/reference/data-model/segments.mdx
@@ -6,9 +6,10 @@ redirect_from:
 
 # Segments
 
-Segments are predefined filters. You can use segments to define complex
-filtering logic in SQL. For example, users for one particular city can be
-treated as a segment:
+You can use the `segments` parameter within [cubes][ref-ref-cubes] to define segments.
+Segments are predefined filters. You can use segments to define complex filtering logic in SQL.
+
+For example, users for one particular city can be treated as a segment:
 
 <CodeTabs>
 
@@ -336,6 +337,7 @@ cubes:
 </CodeTabs>
 
 
+[ref-ref-cubes]: /reference/data-model/cube
 [ref-backend-query]: /product/apis-integrations/rest-api/query-format
 [ref-schema-gen]: /guides/recipes/code-reusability/schema-generation
 [ref-naming]: /product/data-modeling/syntax#naming
diff --git a/docs/pages/reference/data-model/view.mdx b/docs/pages/reference/data-model/view.mdx
index 800bdb98b7..82472bc532 100644
--- a/docs/pages/reference/data-model/view.mdx
+++ b/docs/pages/reference/data-model/view.mdx
@@ -152,7 +152,7 @@ above for `base_orders`.
 The other required parameter inside the `cubes` block is `includes`. Use it
 to list measures, dimensions, or segments you'd like to include into the view. 
 
-To include all members from a cube, use the "includes all" form: `includes: "*"`.
+To include all members from a cube, use the _includes all_ shorthand: `includes: "*"`.
 In that case, you can also use the `excludes` parameter to list members that
 you'd like to exclude. 
 
@@ -292,8 +292,20 @@ view(`arr`, {
   description: `Annual Recurring Revenue`,
   public: COMPILE_CONTEXT.security_context.is_finance,
 
-  includes: [revenue.arr, revenue.date, customers.plan],
-});
+  cubes: [
+    {
+      join_path: revenue,
+      includes: [
+        `arr`,
+        `date`
+      ]
+    },
+    {
+      join_path: revenue.customers,
+      includes: `plan`
+    }
+  ]
+})
 ```
 
 ```yaml
@@ -302,12 +314,15 @@ views:
     description: Annual Recurring Revenue
     public: COMPILE_CONTEXT.security_context.is_finance
 
-    includes:
-      # Measures
-      - revenue.arr
-      # Dimensions
-      - revenue.date
-      - customers.plan
+    cubes:
+      - join_path: revenue
+        includes:
+          - arr
+          - date
+
+      - join_path: revenue.customers
+        includes:
+          - plan
 ```
 
 </CodeTabs>
@@ -340,49 +355,9 @@ views:
 
 </CodeTabs>
 
-### `includes` (deprecated)
-
-<WarningBox>
-
-The top-level `includes` parameter is deprecated and might be removed in
-the future. Please always use the `includes` parameter with `cubes` and
-`join_path` parameters so you can explicitly control the join path.
-
-</WarningBox>
-
-The top-level `includes` parameter is used to bulk add measures or dimensions
-to a view.
-
-<CodeTabs>
-
-```javascript
-view(`active_users`, {
-  includes: [
-    // Measures
-    users.rolling_count,
-
-    // Dimensions
-    users.city,
-    users.created_at,
-  ],
-});
-```
-
-```yaml
-views:
-  - name: active_users
-
-    includes:
-      # Measures
-      - users.rolling_count
-
-      # Dimensions
-      - users.city
-      - users.created_at
-```
-
-</CodeTabs>
+### `access_policy`
 
+The `access_policy` parameter is used to configure [data access policies][ref-ref-dap].
 
 [ref-recipe-control-access-cubes-views]:
   /guides/recipes/access-control/controlling-access-to-cubes-and-views
@@ -391,6 +366,7 @@ views:
 [ref-naming]: /product/data-modeling/syntax#naming
 [ref-apis]: /product/apis-integrations
 [ref-ref-cubes]: /reference/data-model/cube
-[ref-apis-support]: /product/apis-integrations#support-for-data-modeling
+[ref-ref-dap]: /reference/data-model/data-access-policies
+[ref-apis-support]: /product/apis-integrations#data-modeling
 [ref-playground]: /product/workspace/playground#viewing-the-data-model
 [ref-viz-tools]: /product/configuration/visualization-tools
\ No newline at end of file
diff --git a/docs/pages/reference/errors.mdx b/docs/pages/reference/errors.mdx
index 2f9e9bf6fc..23729c9e76 100644
--- a/docs/pages/reference/errors.mdx
+++ b/docs/pages/reference/errors.mdx
@@ -37,7 +37,7 @@ incapsulate join paths and completely remove the possibility of the error in que
 You might also consider setting [`public: false`](/reference/data-model/cube#public)
 on your cubes to hide them from end users.
 
-If you’re building a custom data application, you might use the [`meta` endpoint](/reference/rest-api#v1meta)
+If you’re building a custom data application, you might use the [`meta` endpoint](/product/apis-integrations/rest-api/reference#v1meta)
 of the REST API. It groups cubes into `connectedComponents` to help select those ones
 that can be joined together.
 
diff --git a/docs/redirects.json b/docs/redirects.json
index 62f19d77c5..dd98aef061 100644
--- a/docs/redirects.json
+++ b/docs/redirects.json
@@ -1,4 +1,64 @@
 [
+  {
+    "source": "/product/apis-integrations/semantic-layer-sync/power-bi",
+    "destination": "/product/configuration/visualization-tools/powerbi",
+    "permanent": true
+  },
+  {
+    "source": "/reference/frontend/cubejs-client-core",
+    "destination": "/product/apis-integrations/javascript-sdk/reference/cubejs-client-core",
+    "permanent": true
+  },
+  {
+    "source": "/reference/frontend/cubejs-client-react",
+    "destination": "/product/apis-integrations/javascript-sdk/reference/cubejs-client-react",
+    "permanent": true
+  },
+  {
+    "source": "/reference/frontend/cubejs-client-ngx",
+    "destination": "/product/apis-integrations/javascript-sdk/reference/cubejs-client-ngx",
+    "permanent": true
+  },
+  {
+    "source": "/reference/frontend/cubejs-client-vue",
+    "destination": "/product/apis-integrations/javascript-sdk/reference/cubejs-client-vue",
+    "permanent": true
+  },
+  {
+    "source": "/reference/frontend/cubejs-client-ws-transport",
+    "destination": "/product/apis-integrations/javascript-sdk/reference/cubejs-client-ws-transport",
+    "permanent": true
+  },
+  {
+    "source": "/reference/cli",
+    "destination": "/product/workspace/cli/reference",
+    "permanent": true
+  },
+  {
+    "source": "/reference/ai-api",
+    "destination": "/product/apis-integrations/ai-api/reference",
+    "permanent": true
+  },
+  {
+    "source": "/reference/graphql-api",
+    "destination": "/product/apis-integrations/graphql-api/reference",
+    "permanent": true
+  },
+  {
+    "source": "/reference/rest-api",
+    "destination": "/product/apis-integrations/rest-api/reference",
+    "permanent": true
+  },
+  {
+    "source": "/reference/sql-api",
+    "destination": "/product/apis-integrations/sql-api/reference",
+    "permanent": true
+  },
+  {
+    "source": "/product/data-modeling/concepts/publicity",
+    "destination": "/product/auth/member-level-security",
+    "permanent": true
+  },
   {
     "source": "/guides/recipes/data-modeling/fiscal-year-quarter-dimensions",
     "destination": "/guides/recipes/data-modeling/custom-granularity",
@@ -516,12 +576,12 @@
   },
   {
     "source": "/backend/sql/reference/functions-operators",
-    "destination": "/reference/sql-api/sql-functions-and-operators",
+    "destination": "/product/apis-integrations/sql-api/reference#sql-functions-and-operators",
     "permanent": true
   },
   {
     "source": "/backend/sql/reference/commands",
-    "destination": "/reference/sql-api/sql-commands",
+    "destination": "/product/apis-integrations/sql-api/reference#sql-commands",
     "permanent": true
   },
   {
@@ -581,27 +641,22 @@
   },
   {
     "source": "/rest-api",
-    "destination": "/reference/rest-api",
+    "destination": "/product/apis-integrations/rest-api/reference",
     "permanent": true
   },
   {
     "source": "/backend/graphql",
-    "destination": "/reference/graphql-api",
+    "destination": "/product/apis-integrations/graphql-api/reference",
     "permanent": true
   },
   {
     "source": "/@cubejs-client-vue",
-    "destination": "/reference/frontend/cubejs-client-vue",
+    "destination": "/product/apis-integrations/javascript-sdk/reference/cubejs-client-vue",
     "permanent": true
   },
   {
     "source": "/@cubejs-client-ngx",
-    "destination": "/reference/frontend/cubejs-client-ngx",
-    "permanent": true
-  },
-  {
-    "source": "/reference",
-    "destination": "/reference/cli",
+    "destination": "/product/apis-integrations/javascript-sdk/reference/cubejs-client-ngx",
     "permanent": true
   },
   {
diff --git a/lerna-publish.sh b/lerna-publish.sh
index c01bee96c8..2d6ce46994 100755
--- a/lerna-publish.sh
+++ b/lerna-publish.sh
@@ -5,4 +5,4 @@ BUMP=$1
 if [ "x$BUMP" == "x" ]; then
   BUMP=patch
 fi
-yarn lerna version --create-release=github --conventional-commits --exact $BUMP
+yarn lerna version --create-release=github --conventional-commits --force-publish --exact $BUMP
diff --git a/lerna.json b/lerna.json
index d0a112c36b..42f1b32a31 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.18",
+  "version": "1.2.14",
   "npmClient": "yarn",
   "command": {
     "bootstrap": {
diff --git a/package.json b/package.json
index afe3a8e325..f0ddac4ad4 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "url": "https://github.com/cube-js/cube.git"
   },
   "resolutions": {
+    "es5-ext": "0.10.53",
     "@types/node": "^18",
     "@types/ramda": "0.27.40",
     "thrift": "0.20.0"
diff --git a/packages/cubejs-api-gateway/CHANGELOG.md b/packages/cubejs-api-gateway/CHANGELOG.md
index 606851a2bf..0aac302b43 100644
--- a/packages/cubejs-api-gateway/CHANGELOG.md
+++ b/packages/cubejs-api-gateway/CHANGELOG.md
@@ -3,6 +3,72 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/api-gateway
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/api-gateway
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+### Bug Fixes
+
+- **api-gateway:** data scope check ([#9264](https://github.com/cube-js/cube/issues/9264)) ([75095e1](https://github.com/cube-js/cube/commit/75095e1f86839a3f459d1050226b319d3ed2410f))
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/api-gateway
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/api-gateway
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/api-gateway
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+### Features
+
+- **cubeclient:** Add `short_title` to dimensions and measures ([#9256](https://github.com/cube-js/cube/issues/9256)) ([584b3dc](https://github.com/cube-js/cube/commit/584b3dcefedb7c01b849e7f18a59445bd3542b7e))
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/api-gateway
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/api-gateway
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/api-gateway
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/api-gateway
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/api-gateway
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/api-gateway
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/api-gateway
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+### Features
+
+- **cubeclient:** Add hierarchies to Cube meta ([#9180](https://github.com/cube-js/cube/issues/9180)) ([56dbf9e](https://github.com/cube-js/cube/commit/56dbf9edc8c257cd81f00ff119b12543652b76d0))
+
 ## [1.1.18](https://github.com/cube-js/cube/compare/v1.1.17...v1.1.18) (2025-01-27)
 
 ### Bug Fixes
diff --git a/packages/cubejs-api-gateway/openspec.yml b/packages/cubejs-api-gateway/openspec.yml
index a895bdb3cb..5add9ce3a6 100644
--- a/packages/cubejs-api-gateway/openspec.yml
+++ b/packages/cubejs-api-gateway/openspec.yml
@@ -127,6 +127,8 @@ components:
           type: "string"
         title:
           type: "string"
+        shortTitle:
+          type: "string"
         description:
           type: "string"
         type:
@@ -150,6 +152,8 @@ components:
           type: "string"
         title:
           type: "string"
+        shortTitle:
+          type: "string"
         description:
           type: "string"
         type:
@@ -170,6 +174,20 @@ components:
           type: array
           items:
             type: "string"
+    V1CubeMetaHierarchy:
+      type: "object"
+      required:
+        - name
+        - levels
+      properties:
+        name:
+          type: "string"
+        title:
+          type: "string"
+        levels:
+          type: "array"
+          items:
+            type: "string"
     V1CubeMeta:
       type: "object"
       required:
@@ -209,6 +227,10 @@ components:
           type: "array"
           items:
             $ref: "#/components/schemas/V1CubeMetaFolder"
+        hierarchies:
+          type: "array"
+          items:
+            $ref: "#/components/schemas/V1CubeMetaHierarchy"
     V1CubeMetaType:
       type: "string"
       description: Type of cube
diff --git a/packages/cubejs-api-gateway/package.json b/packages/cubejs-api-gateway/package.json
index 9d389e5d3d..a2868bcd86 100644
--- a/packages/cubejs-api-gateway/package.json
+++ b/packages/cubejs-api-gateway/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/api-gateway",
   "description": "Cube.js API Gateway",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.18",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -27,8 +27,8 @@
     "dist/src/*"
   ],
   "dependencies": {
-    "@cubejs-backend/native": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/native": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "@ungap/structured-clone": "^0.3.4",
     "body-parser": "^1.19.0",
     "chrono-node": "^2.6.2",
@@ -50,7 +50,7 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/express": "^4.17.21",
     "@types/jest": "^27",
     "@types/jsonwebtoken": "^9.0.2",
diff --git a/packages/cubejs-api-gateway/src/gateway.ts b/packages/cubejs-api-gateway/src/gateway.ts
index af90986b41..20d2c0780d 100644
--- a/packages/cubejs-api-gateway/src/gateway.ts
+++ b/packages/cubejs-api-gateway/src/gateway.ts
@@ -385,6 +385,7 @@ class ApiGateway {
         res.setHeader('Transfer-Encoding', 'chunked');
 
         try {
+          await this.assertApiScope('data', req.context?.securityContext);
           await this.sqlServer.execSql(req.body.query, res, req.context?.securityContext);
         } catch (e: any) {
           this.handleError({
diff --git a/packages/cubejs-athena-driver/CHANGELOG.md b/packages/cubejs-athena-driver/CHANGELOG.md
index 17a4e5982a..63ff8b9a63 100644
--- a/packages/cubejs-athena-driver/CHANGELOG.md
+++ b/packages/cubejs-athena-driver/CHANGELOG.md
@@ -3,6 +3,68 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+### Features
+
+- **server-core:** Introduce CUBEJS_REFRESH_WORKER_CONCURRENCY env and update default concurrency settings for drivers ([#9168](https://github.com/cube-js/cube/issues/9168)) ([7ef6282](https://github.com/cube-js/cube/commit/7ef628273905d47996b108862a52dde89b9525e3))
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/athena-driver
diff --git a/packages/cubejs-athena-driver/package.json b/packages/cubejs-athena-driver/package.json
index 538b377087..2fbdbe43b6 100644
--- a/packages/cubejs-athena-driver/package.json
+++ b/packages/cubejs-athena-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/athena-driver",
   "description": "Cube.js Athena database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -29,13 +29,13 @@
   "types": "dist/src/index.d.ts",
   "dependencies": {
     "@aws-sdk/client-athena": "^3.22.0",
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "sqlstring": "^2.3.1"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/testing-shared": "1.1.17",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/testing-shared": "1.2.14",
     "@types/ramda": "^0.27.40",
     "typescript": "~5.2.2"
   },
diff --git a/packages/cubejs-athena-driver/src/AthenaDriver.ts b/packages/cubejs-athena-driver/src/AthenaDriver.ts
index fe60a1dd71..aaea16c04a 100644
--- a/packages/cubejs-athena-driver/src/AthenaDriver.ts
+++ b/packages/cubejs-athena-driver/src/AthenaDriver.ts
@@ -76,7 +76,7 @@ export class AthenaDriver extends BaseDriver implements DriverInterface {
    * Returns default concurrency value.
    */
   public static getDefaultConcurrency(): number {
-    return 5;
+    return 10;
   }
 
   private config: AthenaDriverOptionsInitialized;
diff --git a/packages/cubejs-backend-cloud/CHANGELOG.md b/packages/cubejs-backend-cloud/CHANGELOG.md
index 66ca24afb1..4e9f74cd0f 100644
--- a/packages/cubejs-backend-cloud/CHANGELOG.md
+++ b/packages/cubejs-backend-cloud/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
+## [1.2.4](/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/cloud
diff --git a/packages/cubejs-backend-cloud/package.json b/packages/cubejs-backend-cloud/package.json
index 3cd8c63ea4..ddbf6875c2 100644
--- a/packages/cubejs-backend-cloud/package.json
+++ b/packages/cubejs-backend-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-backend/cloud",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "description": "Cube Cloud package",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@babel/core": "^7.24.5",
     "@babel/preset-env": "^7.24.5",
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/fs-extra": "^9.0.8",
     "@types/jest": "^27",
     "jest": "^27",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@cubejs-backend/dotenv": "^9.0.2",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/shared": "1.2.14",
     "chokidar": "^3.5.1",
     "env-var": "^6.3.0",
     "form-data": "^4.0.0",
diff --git a/packages/cubejs-backend-maven/CHANGELOG.md b/packages/cubejs-backend-maven/CHANGELOG.md
index 053f96fb62..0d6941fd06 100644
--- a/packages/cubejs-backend-maven/CHANGELOG.md
+++ b/packages/cubejs-backend-maven/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/maven
diff --git a/packages/cubejs-backend-maven/package.json b/packages/cubejs-backend-maven/package.json
index f85b12e438..734aeb31db 100644
--- a/packages/cubejs-backend-maven/package.json
+++ b/packages/cubejs-backend-maven/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/maven",
   "description": "Cube.js Maven Wrapper for java dependencies downloading",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -31,12 +31,12 @@
     "dist/src/*"
   ],
   "dependencies": {
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/shared": "1.2.14",
     "source-map-support": "^0.5.19",
     "xmlbuilder2": "^2.4.0"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/jest": "^27",
     "@types/node": "^18",
     "jest": "^27",
diff --git a/packages/cubejs-backend-native/.cargo/config.toml b/packages/cubejs-backend-native/.cargo/config.toml
index 82c8ed99a3..7000a9c841 100644
--- a/packages/cubejs-backend-native/.cargo/config.toml
+++ b/packages/cubejs-backend-native/.cargo/config.toml
@@ -1,7 +1 @@
 # Please keep in sync this file with rust/cubesql!
-
-[target."x86_64-unknown-linux-gnu"]
-rustflags = ["-C", "link-arg=-fuse-ld=lld"]
-
-[target."aarch64-unknown-linux-gnu"]
-rustflags = ["-C", "link-arg=-fuse-ld=lld"]
diff --git a/packages/cubejs-backend-native/CHANGELOG.md b/packages/cubejs-backend-native/CHANGELOG.md
index a8169ed2f4..af5edddb89 100644
--- a/packages/cubejs-backend-native/CHANGELOG.md
+++ b/packages/cubejs-backend-native/CHANGELOG.md
@@ -3,6 +3,88 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/native
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/native
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+### Bug Fixes
+
+- **native:** Jinja - pass kwargs correctly into Python ([#9276](https://github.com/cube-js/cube/issues/9276)) ([9d1c3f8](https://github.com/cube-js/cube/commit/9d1c3f8cfef5fd9383ee5fa69e79328b5c739231))
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/native
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/native
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/native
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+### Bug Fixes
+
+- **backend-native:** Handle closed channel on Rust side ([#9242](https://github.com/cube-js/cube/issues/9242)) ([1203291](https://github.com/cube-js/cube/commit/120329146046f2bffc0b8ff252dcee1cc285d1ef))
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+### Reverts
+
+- **schema-compiler:** Revert breaking changes in models transpilation ([#9240](https://github.com/cube-js/cube/issues/9240)) ([28bca42](https://github.com/cube-js/cube/commit/28bca42a1bb92fff5895ddfe4946601c0ebc2746))
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+### Bug Fixes
+
+- **schema-compiler:** Correct models transpilation in native in multitenant environments ([#9234](https://github.com/cube-js/cube/issues/9234)) ([84f90c0](https://github.com/cube-js/cube/commit/84f90c07ee3827e6f3652dd6c9fab0993ecc8150))
+
+### Features
+
+- **schema-compiler:** Boost models transpilation 10-13x times (using SWC instead of Babel) ([#9225](https://github.com/cube-js/cube/issues/9225)) ([2dd9a4a](https://github.com/cube-js/cube/commit/2dd9a4a5ba0f178e304befc476609fc30ada8975))
+
+### Performance Improvements
+
+- **cubesql:** Avoid allocations in MetaContext methods ([#9228](https://github.com/cube-js/cube/issues/9228)) ([ba753d0](https://github.com/cube-js/cube/commit/ba753d0d43927b50d5cf8faf5f09de3e53bec3db))
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+### Features
+
+- Upgrade rust to 1.84.1 (stable) ([#9222](https://github.com/cube-js/cube/issues/9222)) ([cfc95b5](https://github.com/cube-js/cube/commit/cfc95b5e5601166d2a0aa388a211d4be66630cd8))
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/native
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+### Bug Fixes
+
+- **cubejs-backend-native:** support context_to_cube_store_router_id ([#9200](https://github.com/cube-js/cube/issues/9200)) ([f93edd3](https://github.com/cube-js/cube/commit/f93edd3713c58ad62ca8daee034639b0f10a0282))
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/native
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+### Features
+
+- **tesseract:** Subqueries support ([#9108](https://github.com/cube-js/cube/issues/9108)) ([0dbf3bb](https://github.com/cube-js/cube/commit/0dbf3bb866b731f97b5588b0e620c3be7cbf9e5b))
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/native
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Features
diff --git a/packages/cubejs-backend-native/Cargo.lock b/packages/cubejs-backend-native/Cargo.lock
index 65113ac0e7..91b325facd 100644
--- a/packages/cubejs-backend-native/Cargo.lock
+++ b/packages/cubejs-backend-native/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "Inflector"
@@ -33,7 +33,7 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.11",
  "once_cell",
  "version_check",
 ]
@@ -44,7 +44,7 @@ version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -97,9 +97,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
 
 [[package]]
 name = "arc-swap"
@@ -273,7 +273,7 @@ checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
  "addr2line",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
@@ -328,9 +328,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
 [[package]]
 name = "bitvec"
@@ -362,7 +362,7 @@ dependencies = [
  "arrayref",
  "arrayvec",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "constant_time_eq",
 ]
 
@@ -382,7 +382,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9897ef0f1bd2362169de6d7e436ea2237dc1085d7d1e4db75f4be34d86f309d1"
 dependencies = [
  "borsh-derive",
- "cfg_aliases",
+ "cfg_aliases 0.1.1",
 ]
 
 [[package]]
@@ -432,9 +432,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "bytecheck"
@@ -472,20 +472,15 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cc"
-version = "1.1.5"
+version = "1.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052"
+checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9"
 dependencies = [
  "jobserver",
  "libc",
+ "shlex",
 ]
 
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -498,11 +493,17 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
-version = "0.4.31"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -510,7 +511,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -636,7 +637,7 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -645,7 +646,7 @@ version = "0.8.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -654,7 +655,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.8.0",
  "crossterm_winapi",
  "libc",
  "parking_lot",
@@ -806,7 +807,6 @@ dependencies = [
 name = "cubesql"
 version = "0.28.0"
 dependencies = [
- "anyhow",
  "arc-swap",
  "async-stream",
  "async-trait",
@@ -814,25 +814,22 @@ dependencies = [
  "bigdecimal",
  "bincode",
  "bitflags 1.3.2",
- "byteorder",
  "bytes",
  "chrono",
  "chrono-tz 0.6.3",
  "comfy-table 7.1.0",
- "csv",
  "cubeclient",
  "datafusion",
  "egg",
  "futures",
  "futures-core",
  "futures-util",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
  "indexmap 1.9.3",
- "itertools 0.10.5",
+ "itertools 0.14.0",
  "log",
  "lru",
  "minijinja",
- "mockall",
  "paste",
  "pg-srv",
  "postgres-types",
@@ -844,10 +841,9 @@ dependencies = [
  "sha1_smol",
  "sha2",
  "simple_logger",
- "smallvec",
  "sqlparser",
  "tera",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tokio-util",
  "tracing",
@@ -974,12 +970,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "difference"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -992,10 +982,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "downcast"
-version = "0.10.0"
+name = "displaydoc"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb454f0228b18c7f4c3b0ebbee346ed9c52e7443b0999cd543ff3571205701d"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
 
 [[package]]
 name = "egg"
@@ -1015,15 +1010,15 @@ dependencies = [
  "smallvec",
  "symbol_table",
  "symbolic_expressions",
- "thiserror",
+ "thiserror 1.0.69",
  "vectorize",
 ]
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "env_logger"
@@ -1042,9 +1037,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -1079,9 +1074,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
 [[package]]
 name = "fastrand"
-version = "2.0.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "findshlibs"
@@ -1109,7 +1104,7 @@ checksum = "86b428b715fdbdd1c364b84573b5fdc0f84f8e423661b9f398735278bc7f2b6a"
 dependencies = [
  "bitflags 1.3.2",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -1132,21 +1127,18 @@ dependencies = [
  "miniz_oxide",
 ]
 
-[[package]]
-name = "float-cmp"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -1156,21 +1148,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fragile"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7464c5c4a3f014d9b2ec4073650e5c06596f385060af740fc45ad5a19f959e8"
-dependencies = [
- "fragile 2.0.0",
-]
-
-[[package]]
-name = "fragile"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -1291,9 +1268,23 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
+ "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -1344,14 +1335,25 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
  "ahash 0.8.11",
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -1524,14 +1526,143 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1564,12 +1695,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.4.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -1584,7 +1715,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -1628,6 +1759,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.10"
@@ -1724,9 +1864,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libloading"
@@ -1734,7 +1874,7 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "windows-targets 0.52.0",
 ]
 
@@ -1746,9 +1886,15 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.12"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "lock_api"
@@ -1779,11 +1925,11 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7"
+checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465"
 dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -1818,7 +1964,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "digest",
 ]
 
@@ -1887,37 +2033,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "mockall"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cabea45a7fc0e37093f4f30a5e2b62602253f91791c057d5f0470c63260c3d"
-dependencies = [
- "cfg-if 0.1.10",
- "downcast",
- "fragile 1.2.2",
- "lazy_static",
- "mockall_derive",
- "predicates",
- "predicates-tree",
-]
-
-[[package]]
-name = "mockall_derive"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c461918bf7f59eefb1459252756bf2351a995d6bd510d0b2061bd86bcdabfa6"
-dependencies = [
- "cfg-if 0.1.10",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "multiversion"
 version = "0.6.1"
@@ -1977,12 +2096,6 @@ dependencies = [
  "syn-mid",
 ]
 
-[[package]]
-name = "normalize-line-endings"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
-
 [[package]]
 name = "num"
 version = "0.4.1"
@@ -2124,9 +2237,9 @@ version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.4.1",
  "smallvec",
  "windows-targets 0.48.5",
 ]
@@ -2189,7 +2302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5"
 dependencies = [
  "memchr",
- "thiserror",
+ "thiserror 1.0.69",
  "ucd-trie",
 ]
 
@@ -2236,7 +2349,7 @@ dependencies = [
  "bytes",
  "chrono",
  "log",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
 ]
 
@@ -2366,35 +2479,6 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
-[[package]]
-name = "predicates"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df"
-dependencies = [
- "difference",
- "float-cmp",
- "normalize-line-endings",
- "predicates-core",
- "regex",
-]
-
-[[package]]
-name = "predicates-core"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
-
-[[package]]
-name = "predicates-tree"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
-dependencies = [
- "predicates-core",
- "termtree",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "2.0.1"
@@ -2463,7 +2547,7 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "indoc",
  "libc",
  "memoffset",
@@ -2545,9 +2629,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.2"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -2555,34 +2639,39 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls",
- "thiserror",
+ "socket2",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.3"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom 0.2.11",
  "rand",
  "ring",
  "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror",
+ "thiserror 2.0.11",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.2"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46"
+checksum = "e46f3055866785f6b92bc6164b76be02ca8f2eb4b002c0354b28cf4c119e5944"
 dependencies = [
+ "cfg_aliases 0.2.1",
  "libc",
  "once_cell",
  "socket2",
@@ -2632,7 +2721,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.11",
 ]
 
 [[package]]
@@ -2644,27 +2733,36 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-automata",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -2675,9 +2773,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rend"
@@ -2742,7 +2840,7 @@ dependencies = [
  "http",
  "reqwest",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "tower-service",
 ]
 
@@ -2753,7 +2851,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
 dependencies = [
  "cc",
- "getrandom",
+ "getrandom 0.2.11",
  "libc",
  "spin",
  "untrusted",
@@ -2813,9 +2911,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustc-hash"
-version = "1.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc_version"
@@ -2828,11 +2926,11 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.28"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.8.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -2868,6 +2966,9 @@ name = "rustls-pki-types"
 version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
@@ -2882,9 +2983,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.14"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
 
 [[package]]
 name = "ryu"
@@ -2939,18 +3040,18 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.215"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2959,11 +3060,11 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.133"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
- "indexmap 2.4.0",
+ "indexmap 2.7.1",
  "itoa",
  "memchr",
  "ryu",
@@ -2998,7 +3099,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest",
 ]
@@ -3015,11 +3116,17 @@ version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.1"
@@ -3099,6 +3206,12 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -3234,6 +3347,17 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -3248,15 +3372,16 @@ checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
 
 [[package]]
 name = "tempfile"
-version = "3.8.1"
+version = "3.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fastrand",
- "redox_syscall",
+ "getrandom 0.3.1",
+ "once_cell",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3276,25 +3401,39 @@ dependencies = [
 ]
 
 [[package]]
-name = "termtree"
-version = "0.4.1"
+name = "thiserror"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 2.0.11",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3307,7 +3446,7 @@ version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
 ]
 
@@ -3333,6 +3472,16 @@ dependencies = [
  "threadpool",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -3466,7 +3615,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
- "indexmap 2.4.0",
+ "indexmap 2.7.1",
  "toml_datetime",
  "winnow",
 ]
@@ -3551,7 +3700,7 @@ dependencies = [
  "log",
  "rand",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
  "utf-8",
 ]
@@ -3683,9 +3832,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3698,13 +3847,25 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "uuid"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.11",
 ]
 
 [[package]]
@@ -3713,7 +3874,7 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.11",
  "serde",
 ]
 
@@ -3757,13 +3918,28 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "wasm-bindgen-macro",
 ]
 
@@ -3788,7 +3964,7 @@ version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -3833,6 +4009,16 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.26.3"
@@ -3844,11 +4030,12 @@ dependencies = [
 
 [[package]]
 name = "whoami"
-version = "1.4.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
+checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
- "wasm-bindgen",
+ "redox_syscall 0.5.9",
+ "wasite",
  "web-sys",
 ]
 
@@ -4039,10 +4226,31 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -4052,6 +4260,30 @@ dependencies = [
  "tap",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "synstructure",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.32"
@@ -4072,12 +4304,55 @@ dependencies = [
  "syn 2.0.90",
 ]
 
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "synstructure",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "zstd"
 version = "0.11.2+zstd.1.5.2"
diff --git a/packages/cubejs-backend-native/Cargo.toml b/packages/cubejs-backend-native/Cargo.toml
index 37ddb4094c..ba826fda48 100644
--- a/packages/cubejs-backend-native/Cargo.toml
+++ b/packages/cubejs-backend-native/Cargo.toml
@@ -36,8 +36,11 @@ minijinja = { version = "1", features = ["json", "loader"] }
 once_cell = "1.10"
 # python
 pyo3 = { version = "0.20.0", features = [], optional = true }
-pyo3-asyncio = { version = "0.20.0", features = ["tokio-runtime", "attributes"], optional = true }
-serde = { version = "1.0.209", features = ["derive"] }
+pyo3-asyncio = { version = "0.20.0", features = [
+    "tokio-runtime",
+    "attributes",
+], optional = true }
+serde = { version = "1.0.217", features = ["derive"] }
 serde_json = "1.0.127"
 simple_logger = "1.7.0"
 tokio = { version = "1", features = ["full", "rt"] }
diff --git a/packages/cubejs-backend-native/js/index.ts b/packages/cubejs-backend-native/js/index.ts
index f6c54477f4..eec5c7370d 100644
--- a/packages/cubejs-backend-native/js/index.ts
+++ b/packages/cubejs-backend-native/js/index.ts
@@ -101,6 +101,23 @@ export type SQLInterfaceOptions = {
   gatewayPort?: number,
 };
 
+export interface TransformConfig {
+  fileName: string;
+  transpilers: string[];
+  compilerId: string;
+  metaData?: {
+    cubeNames: string[];
+    cubeSymbols: Record<string, Record<string, boolean>>;
+    contextSymbols: Record<string, string>;
+  }
+}
+
+export interface TransformResponse {
+  code: string;
+  errors: string[];
+  warnings: string[];
+}
+
 export type DBResponsePrimitive =
   null |
   boolean |
@@ -275,7 +292,23 @@ function wrapNativeFunctionWithStream(
       if (!!response && !!response.stream) {
         response.stream.destroy(e);
       }
-      writerOrChannel.reject(errorString(e));
+
+      try {
+        writerOrChannel.reject(errorString(e));
+      } catch (rejectError) {
+        // This is async function, just for usability, it's return value is not expected anywhere
+        // Rust part does not care for returned promises, so we should take care here to avoid unhandled rejections
+        // `writerOrChannel.reject` can throw when channel is already dropped by Rust side
+        // This can happen directly, when drop happened between creating channel and calling `reject`,
+        // or indirectly, when drop happened between creating channel and calling `resolve`, resolve raised an exception
+        // that was caught here
+        // There's nothing we can do, or should do with this: there's nobody to respond to
+        if (process.env.CUBEJS_NATIVE_INTERNAL_DEBUG) {
+          console.debug('[js] writerOrChannel.reject exception', {
+            e: rejectError,
+          });
+        }
+      }
     }
   };
 }
@@ -405,6 +438,16 @@ export const getFinalQueryResultMulti = (transformDataArr: Object[], rows: any[]
   return native.getFinalQueryResultMulti(transformDataArr, rows, responseData);
 };
 
+export const transpileJs = async (content: String, metadata: TransformConfig): Promise<TransformResponse> => {
+  const native = loadNative();
+
+  if (native.transpileJs) {
+    return native.transpileJs(content, metadata);
+  }
+
+  throw new Error('TranspileJs native implementation not found!');
+};
+
 export interface PyConfiguration {
   repositoryFactory?: (ctx: unknown) => Promise<unknown>,
   logger?: (msg: string, params: Record<string, any>) => void,
diff --git a/packages/cubejs-backend-native/package.json b/packages/cubejs-backend-native/package.json
index 45861acb7d..fcb932a815 100644
--- a/packages/cubejs-backend-native/package.json
+++ b/packages/cubejs-backend-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-backend/native",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "author": "Cube Dev, Inc.",
   "description": "Native module for Cube.js (binding to Rust codebase)",
   "main": "dist/js/index.js",
@@ -34,7 +34,7 @@
     "dist/js"
   ],
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/jest": "^27",
     "@types/node": "^18",
     "cargo-cp-artifact": "^0.1.9",
@@ -44,8 +44,8 @@
     "uuid": "^8.3.2"
   },
   "dependencies": {
-    "@cubejs-backend/cubesql": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/cubesql": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "@cubejs-infra/post-installer": "^0.0.7"
   },
   "resources": {
diff --git a/packages/cubejs-backend-native/python/cube/src/__init__.py b/packages/cubejs-backend-native/python/cube/src/__init__.py
index e8b52ab046..6a49f9545e 100644
--- a/packages/cubejs-backend-native/python/cube/src/__init__.py
+++ b/packages/cubejs-backend-native/python/cube/src/__init__.py
@@ -62,6 +62,7 @@ class Configuration:
     logger: Callable
     context_to_app_id: Union[str, Callable[[RequestContext], str]]
     context_to_orchestrator_id: Union[str, Callable[[RequestContext], str]]
+    context_to_cube_store_router_id: Union[str, Callable[[RequestContext], str]]
     driver_factory: Callable[[RequestContext], Dict]
     external_driver_factory: Callable[[RequestContext], Dict]
     db_type: Union[str, Callable[[RequestContext], str]]
@@ -108,6 +109,7 @@ def __init__(self):
         self.logger = None
         self.context_to_app_id = None
         self.context_to_orchestrator_id = None
+        self.context_to_cube_store_router_id = None
         self.driver_factory = None
         self.external_driver_factory = None
         self.db_type = None
diff --git a/packages/cubejs-backend-native/rust-toolchain.toml b/packages/cubejs-backend-native/rust-toolchain.toml
index 13598fb83c..d9f5179de3 100644
--- a/packages/cubejs-backend-native/rust-toolchain.toml
+++ b/packages/cubejs-backend-native/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2024-07-15"
+channel = "1.84.1"
 components = ["rustfmt", "clippy"]
-profile = "minimal"
\ No newline at end of file
+profile = "minimal"
diff --git a/packages/cubejs-backend-native/src/cross/clrepr.rs b/packages/cubejs-backend-native/src/cross/clrepr.rs
index 9c6f4d3f4a..9e0b17b256 100644
--- a/packages/cubejs-backend-native/src/cross/clrepr.rs
+++ b/packages/cubejs-backend-native/src/cross/clrepr.rs
@@ -15,18 +15,24 @@ use std::collections::hash_map::{IntoIter, Iter, Keys};
 use std::collections::HashMap;
 use std::sync::Arc;
 
+#[derive(Debug, Clone)]
+pub enum CLReprObjectKind {
+    Object,
+    KWargs,
+}
+
 #[derive(Clone)]
-pub struct CLReprObject(pub(crate) HashMap<String, CLRepr>);
+pub struct CLReprObject(pub(crate) HashMap<String, CLRepr>, CLReprObjectKind);
 
 impl Default for CLReprObject {
     fn default() -> Self {
-        Self::new()
+        Self::new(CLReprObjectKind::Object)
     }
 }
 
 impl CLReprObject {
-    pub fn new() -> Self {
-        Self(HashMap::new())
+    pub fn new(kind: CLReprObjectKind) -> Self {
+        Self(HashMap::new(), kind)
     }
 
     pub fn get(&self, key: &str) -> Option<&CLRepr> {
@@ -110,6 +116,15 @@ pub enum CLRepr {
     Null,
 }
 
+impl CLRepr {
+    pub fn is_kwarg(&self) -> bool {
+        match self {
+            CLRepr::Object(obj) => matches!(obj.1, CLReprObjectKind::KWargs),
+            _ => false,
+        }
+    }
+}
+
 impl std::fmt::Display for CLRepr {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(&self, f)
@@ -179,7 +194,7 @@ impl CLRepr {
 
             Ok(CLRepr::Array(r))
         } else if from.is_a::<JsObject, _>(cx) {
-            let mut obj = CLReprObject::new();
+            let mut obj = CLReprObject::new(CLReprObjectKind::Object);
 
             let v = from.downcast_or_throw::<JsObject, _>(cx)?;
             let properties = v.get_own_property_names(cx)?;
diff --git a/packages/cubejs-backend-native/src/cross/clrepr_python.rs b/packages/cubejs-backend-native/src/cross/clrepr_python.rs
index 3a834dba55..9712206845 100644
--- a/packages/cubejs-backend-native/src/cross/clrepr_python.rs
+++ b/packages/cubejs-backend-native/src/cross/clrepr_python.rs
@@ -1,5 +1,5 @@
 use crate::cross::clrepr::CLReprObject;
-use crate::cross::{CLRepr, StringType};
+use crate::cross::{CLRepr, CLReprObjectKind, StringType};
 use pyo3::exceptions::{PyNotImplementedError, PyTypeError};
 use pyo3::types::{
     PyBool, PyComplex, PyDate, PyDict, PyFloat, PyFrame, PyFunction, PyInt, PyList, PySequence,
@@ -16,15 +16,9 @@ pub enum PythonRef {
     PyExternalFunction(Py<PyFunction>),
 }
 
-pub trait CLReprPython: Sized {
-    fn from_python_ref(v: &PyAny) -> Result<Self, PyErr>;
-    fn into_py_impl(from: CLRepr, py: Python) -> Result<PyObject, PyErr>;
-    fn into_py(self, py: Python) -> Result<PyObject, PyErr>;
-}
-
-impl CLReprPython for CLRepr {
+impl CLRepr {
     /// Convert python value to CLRepr
-    fn from_python_ref(v: &PyAny) -> Result<Self, PyErr> {
+    pub fn from_python_ref(v: &PyAny) -> Result<Self, PyErr> {
         if v.is_none() {
             return Ok(Self::Null);
         }
@@ -47,7 +41,7 @@ impl CLReprPython for CLRepr {
             Self::Int(i)
         } else if v.get_type().is_subclass_of::<PyDict>()? {
             let d = v.downcast::<PyDict>()?;
-            let mut obj = CLReprObject::new();
+            let mut obj = CLReprObject::new(CLReprObjectKind::Object);
 
             for (k, v) in d.iter() {
                 if k.get_type().is_subclass_of::<PyString>()? {
@@ -126,6 +120,16 @@ impl CLReprPython for CLRepr {
         })
     }
 
+    fn into_py_dict_impl(obj: CLReprObject, py: Python) -> Result<&PyDict, PyErr> {
+        let r = PyDict::new(py);
+
+        for (k, v) in obj.into_iter() {
+            r.set_item(k, Self::into_py_impl(v, py)?)?;
+        }
+
+        Ok(r)
+    }
+
     fn into_py_impl(from: CLRepr, py: Python) -> Result<PyObject, PyErr> {
         Ok(match from {
             CLRepr::String(v, _) => PyString::new(py, &v).to_object(py),
@@ -155,11 +159,7 @@ impl CLReprPython for CLRepr {
                 PyTuple::new(py, elements).to_object(py)
             }
             CLRepr::Object(obj) => {
-                let r = PyDict::new(py);
-
-                for (k, v) in obj.into_iter() {
-                    r.set_item(k, Self::into_py_impl(v, py)?)?;
-                }
+                let r = Self::into_py_dict_impl(obj, py)?;
 
                 r.to_object(py)
             }
@@ -189,7 +189,19 @@ impl CLReprPython for CLRepr {
         })
     }
 
-    fn into_py(self, py: Python) -> Result<PyObject, PyErr> {
+    pub fn into_py_dict(self, py: Python) -> Result<&PyDict, PyErr> {
+        Ok(match self {
+            CLRepr::Object(obj) => Self::into_py_dict_impl(obj, py)?,
+            other => {
+                return Err(PyErr::new::<PyNotImplementedError, _>(format!(
+                    "Unable to convert {:?} into PyDict",
+                    other.kind()
+                )))
+            }
+        })
+    }
+
+    pub fn into_py(self, py: Python) -> Result<PyObject, PyErr> {
         Self::into_py_impl(self, py)
     }
 }
diff --git a/packages/cubejs-backend-native/src/cross/mod.rs b/packages/cubejs-backend-native/src/cross/mod.rs
index 39c4ad999e..8f9bbc4649 100644
--- a/packages/cubejs-backend-native/src/cross/mod.rs
+++ b/packages/cubejs-backend-native/src/cross/mod.rs
@@ -4,7 +4,7 @@ mod clrepr_python;
 #[cfg(feature = "python")]
 mod py_in_js;
 
-pub use clrepr::{CLRepr, CLReprKind, CLReprObject, StringType};
+pub use clrepr::{CLRepr, CLReprKind, CLReprObject, CLReprObjectKind, StringType};
 
 #[cfg(feature = "python")]
-pub use clrepr_python::{CLReprPython, PythonRef};
+pub use clrepr_python::PythonRef;
diff --git a/packages/cubejs-backend-native/src/lib.rs b/packages/cubejs-backend-native/src/lib.rs
index 6828507554..60104692c6 100644
--- a/packages/cubejs-backend-native/src/lib.rs
+++ b/packages/cubejs-backend-native/src/lib.rs
@@ -1,7 +1,6 @@
-#![feature(async_closure)]
-#![feature(thread_id_value)]
 #![allow(clippy::result_large_err)]
 
+#[cfg(feature = "python")]
 extern crate findshlibs;
 
 pub mod auth;
diff --git a/packages/cubejs-backend-native/src/node_export.rs b/packages/cubejs-backend-native/src/node_export.rs
index 5d4eb73320..802076279c 100644
--- a/packages/cubejs-backend-native/src/node_export.rs
+++ b/packages/cubejs-backend-native/src/node_export.rs
@@ -18,7 +18,7 @@ use crate::stream::OnDrainHandler;
 use crate::tokio_runtime_node;
 use crate::transport::NodeBridgeTransport;
 use crate::utils::batch_to_rows;
-use cubenativeutils::wrappers::neon::context::ContextHolder;
+use cubenativeutils::wrappers::neon::context::neon_run_with_guarded_lifetime;
 use cubenativeutils::wrappers::neon::inner_types::NeonInnerTypes;
 use cubenativeutils::wrappers::neon::object::NeonObject;
 use cubenativeutils::wrappers::object_handle::NativeObjectHandle;
@@ -462,37 +462,29 @@ pub fn setup_logger(mut cx: FunctionContext) -> JsResult<JsUndefined> {
 //============ sql planner ===================
 
 fn build_sql_and_params(cx: FunctionContext) -> JsResult<JsValue> {
-    //IMPORTANT It seems to be safe here, because context lifetime is bound to function, but this
-    //context should be used only inside function
-    let mut cx = extend_function_context_lifetime(cx);
-    let options = cx.argument::<JsValue>(0)?;
-
-    let neon_context_holder = ContextHolder::new(cx);
-
-    let options = NativeObjectHandle::<NeonInnerTypes<'static, FunctionContext<'static>>>::new(
-        NeonObject::new(neon_context_holder.clone(), options),
-    );
-
-    let context_holder =
-        NativeContextHolder::<NeonInnerTypes<'static, FunctionContext<'static>>>::new(
+    neon_run_with_guarded_lifetime(cx, |neon_context_holder| {
+        let options =
+            NativeObjectHandle::<NeonInnerTypes<FunctionContext<'static>>>::new(NeonObject::new(
+                neon_context_holder.clone(),
+                neon_context_holder
+                    .with_context(|cx| cx.argument::<JsValue>(0))
+                    .unwrap()?,
+            ));
+
+        let context_holder = NativeContextHolder::<NeonInnerTypes<FunctionContext<'static>>>::new(
             neon_context_holder,
         );
 
-    let base_query_options = Rc::new(NativeBaseQueryOptions::from_native(options).unwrap());
+        let base_query_options = Rc::new(NativeBaseQueryOptions::from_native(options).unwrap());
 
-    let base_query = BaseQuery::try_new(context_holder.clone(), base_query_options).unwrap();
+        let base_query = BaseQuery::try_new(context_holder.clone(), base_query_options).unwrap();
 
-    //arg_clrep.into_js(&mut cx)
-    let res = base_query.build_sql_and_params().unwrap();
-
-    let result: NeonObject<'static, FunctionContext<'static>> = res.into_object();
-    let result = result.into_object();
-
-    Ok(result)
-}
+        let res = base_query.build_sql_and_params();
 
-fn extend_function_context_lifetime<'a>(cx: FunctionContext<'a>) -> FunctionContext<'static> {
-    unsafe { std::mem::transmute::<FunctionContext<'a>, FunctionContext<'static>>(cx) }
+        let result: NeonObject<FunctionContext<'static>> = res.into_object();
+        let result = result.into_object();
+        Ok(result)
+    })
 }
 
 fn debug_js_to_clrepr_to_js(mut cx: FunctionContext) -> JsResult<JsValue> {
diff --git a/packages/cubejs-backend-native/src/node_obj_deserializer.rs b/packages/cubejs-backend-native/src/node_obj_deserializer.rs
index d9ed815682..9f10790cfd 100644
--- a/packages/cubejs-backend-native/src/node_obj_deserializer.rs
+++ b/packages/cubejs-backend-native/src/node_obj_deserializer.rs
@@ -41,7 +41,7 @@ impl<'a, 'b> JsValueDeserializer<'a, 'b> {
     }
 }
 
-impl<'de, 'a, 'b> Deserializer<'de> for JsValueDeserializer<'a, 'b> {
+impl<'de> Deserializer<'de> for JsValueDeserializer<'_, '_> {
     type Error = JsDeserializationError;
 
     fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, Self::Error>
@@ -294,7 +294,7 @@ impl<'a, 'b> JsObjectDeserializer<'a, 'b> {
 
 // `MapAccess` is provided to the `Visitor` to give it the ability to iterate
 // through entries of the map.
-impl<'de, 'a, 'b> MapAccess<'de> for JsObjectDeserializer<'a, 'b> {
+impl<'de> MapAccess<'de> for JsObjectDeserializer<'_, '_> {
     type Error = JsDeserializationError;
 
     fn next_key_seed<K>(&mut self, seed: K) -> Result<Option<K::Value>, Self::Error>
@@ -343,7 +343,7 @@ impl<'a, 'b> JsArrayDeserializer<'a, 'b> {
 
 // `SeqAccess` is provided to the `Visitor` to give it the ability to iterate
 // through elements of the sequence.
-impl<'de, 'a, 'b> SeqAccess<'de> for JsArrayDeserializer<'a, 'b> {
+impl<'de> SeqAccess<'de> for JsArrayDeserializer<'_, '_> {
     type Error = JsDeserializationError;
 
     fn next_element_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>, Self::Error>
@@ -381,7 +381,7 @@ impl<'a, 'b> JsEnumDeserializer<'a, 'b> {
 
 // `EnumAccess` is provided to the `Visitor` to give it the ability to determine
 // which variant of the enum is supposed to be deserialized.
-impl<'de, 'a, 'b> EnumAccess<'de> for JsEnumDeserializer<'a, 'b> {
+impl<'de> EnumAccess<'de> for JsEnumDeserializer<'_, '_> {
     type Error = JsDeserializationError;
     type Variant = Self;
 
@@ -394,7 +394,7 @@ impl<'de, 'a, 'b> EnumAccess<'de> for JsEnumDeserializer<'a, 'b> {
     }
 }
 
-impl<'de, 'a, 'b> VariantAccess<'de> for JsEnumDeserializer<'a, 'b> {
+impl<'de> VariantAccess<'de> for JsEnumDeserializer<'_, '_> {
     type Error = JsDeserializationError;
 
     // If the `Visitor` expected this variant to be a unit variant, the input
diff --git a/packages/cubejs-backend-native/src/node_obj_serializer.rs b/packages/cubejs-backend-native/src/node_obj_serializer.rs
index 5fae33cd6b..ea9f370f6a 100644
--- a/packages/cubejs-backend-native/src/node_obj_serializer.rs
+++ b/packages/cubejs-backend-native/src/node_obj_serializer.rs
@@ -53,7 +53,7 @@ impl<'a, 'b, C: Context<'a>> NodeObjSerializer<'a, 'b, C> {
     }
 }
 
-impl<'a, 'b, 'c, C: Context<'a>> ser::Serializer for &'c mut NodeObjSerializer<'a, 'b, C> {
+impl<'a, 'c, C: Context<'a>> ser::Serializer for &'c mut NodeObjSerializer<'a, '_, C> {
     type Ok = Handle<'a, JsValue>;
     type Error = NodeObjSerializerError;
     type SerializeSeq = NodeObjSeqSerializer<'a, 'c, C>;
@@ -242,7 +242,7 @@ impl<'a, 'b, 'c, C: Context<'a>> ser::Serializer for &'c mut NodeObjSerializer<'
     }
 }
 
-impl<'a, 'b, C: Context<'a>> ser::SerializeMap for NodeObjMapSerializer<'a, 'b, C> {
+impl<'a, C: Context<'a>> ser::SerializeMap for NodeObjMapSerializer<'a, '_, C> {
     type Ok = Handle<'a, JsValue>;
     type Error = NodeObjSerializerError;
 
@@ -284,7 +284,7 @@ impl<'a, 'b, C: Context<'a>> ser::SerializeMap for NodeObjMapSerializer<'a, 'b,
     }
 }
 
-impl<'a, 'b, C: Context<'a>> ser::SerializeTuple for NodeObjTupleSerializer<'a, 'b, C> {
+impl<'a, C: Context<'a>> ser::SerializeTuple for NodeObjTupleSerializer<'a, '_, C> {
     type Ok = Handle<'a, JsValue>;
     type Error = NodeObjSerializerError;
 
@@ -299,7 +299,7 @@ impl<'a, 'b, C: Context<'a>> ser::SerializeTuple for NodeObjTupleSerializer<'a,
     }
 }
 
-impl<'a, 'b, C: Context<'a>> ser::SerializeTupleStruct for NodeObjTupleSerializer<'a, 'b, C> {
+impl<'a, C: Context<'a>> ser::SerializeTupleStruct for NodeObjTupleSerializer<'a, '_, C> {
     type Ok = Handle<'a, JsValue>;
     type Error = NodeObjSerializerError;
 
@@ -314,7 +314,7 @@ impl<'a, 'b, C: Context<'a>> ser::SerializeTupleStruct for NodeObjTupleSerialize
     }
 }
 
-impl<'a, 'b, C: Context<'a>> ser::SerializeTupleVariant for NodeObjTupleSerializer<'a, 'b, C> {
+impl<'a, C: Context<'a>> ser::SerializeTupleVariant for NodeObjTupleSerializer<'a, '_, C> {
     type Ok = Handle<'a, JsValue>;
     type Error = NodeObjSerializerError;
 
@@ -329,7 +329,7 @@ impl<'a, 'b, C: Context<'a>> ser::SerializeTupleVariant for NodeObjTupleSerializ
     }
 }
 
-impl<'a, 'b, C: Context<'a>> ser::SerializeStruct for NodeObjMapSerializer<'a, 'b, C> {
+impl<'a, C: Context<'a>> ser::SerializeStruct for NodeObjMapSerializer<'a, '_, C> {
     type Ok = Handle<'a, JsValue>;
     type Error = NodeObjSerializerError;
 
@@ -350,7 +350,7 @@ impl<'a, 'b, C: Context<'a>> ser::SerializeStruct for NodeObjMapSerializer<'a, '
     }
 }
 
-impl<'a, 'b, C: Context<'a>> ser::SerializeStructVariant for NodeObjMapSerializer<'a, 'b, C> {
+impl<'a, C: Context<'a>> ser::SerializeStructVariant for NodeObjMapSerializer<'a, '_, C> {
     type Ok = Handle<'a, JsValue>;
     type Error = NodeObjSerializerError;
 
@@ -369,7 +369,7 @@ impl<'a, 'b, C: Context<'a>> ser::SerializeStructVariant for NodeObjMapSerialize
     }
 }
 
-impl<'a, 'b, C: Context<'a>> ser::SerializeSeq for NodeObjSeqSerializer<'a, 'b, C> {
+impl<'a, C: Context<'a>> ser::SerializeSeq for NodeObjSeqSerializer<'a, '_, C> {
     type Ok = Handle<'a, JsValue>;
     type Error = NodeObjSerializerError;
 
diff --git a/packages/cubejs-backend-native/src/python/cube_config.rs b/packages/cubejs-backend-native/src/python/cube_config.rs
index b0bec3d722..d612ebdc3b 100644
--- a/packages/cubejs-backend-native/src/python/cube_config.rs
+++ b/packages/cubejs-backend-native/src/python/cube_config.rs
@@ -2,7 +2,7 @@ use convert_case::{Case, Casing};
 use neon::prelude::*;
 use pyo3::{PyAny, PyResult};
 
-use crate::cross::{CLRepr, CLReprObject, CLReprPython};
+use crate::cross::{CLRepr, CLReprObject, CLReprObjectKind};
 
 pub struct CubeConfigPy {
     properties: CLReprObject,
@@ -11,7 +11,7 @@ pub struct CubeConfigPy {
 impl CubeConfigPy {
     pub fn new() -> Self {
         Self {
-            properties: CLReprObject::new(),
+            properties: CLReprObject::new(CLReprObjectKind::Object),
         }
     }
 
@@ -50,6 +50,7 @@ impl CubeConfigPy {
             "context_to_api_scopes",
             "context_to_app_id",
             "context_to_orchestrator_id",
+            "context_to_cube_store_router_id",
             "context_to_roles",
             "db_type",
             "driver_factory",
diff --git a/packages/cubejs-backend-native/src/python/entry.rs b/packages/cubejs-backend-native/src/python/entry.rs
index 9e8eed0eea..b780b1f689 100644
--- a/packages/cubejs-backend-native/src/python/entry.rs
+++ b/packages/cubejs-backend-native/src/python/entry.rs
@@ -77,9 +77,9 @@ fn python_load_model(mut cx: FunctionContext) -> JsResult<JsPromise> {
 
         let model_module = PyModule::from_code(py, &model_content, &model_file_name, "")?;
 
-        let mut collected_functions = CLReprObject::new();
-        let mut collected_variables = CLReprObject::new();
-        let mut collected_filters = CLReprObject::new();
+        let mut collected_functions = CLReprObject::new(CLReprObjectKind::Object);
+        let mut collected_variables = CLReprObject::new(CLReprObjectKind::Object);
+        let mut collected_filters = CLReprObject::new(CLReprObjectKind::Object);
 
         if model_module.hasattr("template")? {
             let template = model_module.getattr("template")?;
diff --git a/packages/cubejs-backend-native/src/python/python_model.rs b/packages/cubejs-backend-native/src/python/python_model.rs
index a30ec54d4b..cbc9bdd02c 100644
--- a/packages/cubejs-backend-native/src/python/python_model.rs
+++ b/packages/cubejs-backend-native/src/python/python_model.rs
@@ -1,6 +1,6 @@
 use neon::prelude::*;
 
-use crate::cross::{CLRepr, CLReprObject};
+use crate::cross::{CLRepr, CLReprObject, CLReprObjectKind};
 
 pub struct CubePythonModel {
     functions: CLReprObject,
@@ -23,7 +23,7 @@ impl Finalize for CubePythonModel {}
 impl CubePythonModel {
     #[allow(clippy::wrong_self_convention)]
     pub fn to_object<'a, C: Context<'a>>(self, cx: &mut C) -> JsResult<'a, JsValue> {
-        let mut obj = CLReprObject::new();
+        let mut obj = CLReprObject::new(CLReprObjectKind::Object);
         obj.insert("functions".to_string(), CLRepr::Object(self.functions));
         obj.insert("variables".to_string(), CLRepr::Object(self.variables));
         obj.insert("filters".to_string(), CLRepr::Object(self.filters));
diff --git a/packages/cubejs-backend-native/src/python/runtime.rs b/packages/cubejs-backend-native/src/python/runtime.rs
index 7836eca591..3a0308243a 100644
--- a/packages/cubejs-backend-native/src/python/runtime.rs
+++ b/packages/cubejs-backend-native/src/python/runtime.rs
@@ -1,4 +1,4 @@
-use crate::cross::{CLRepr, CLReprPython};
+use crate::cross::CLRepr;
 use crate::python::neon_py::*;
 use crate::tokio_runtime_node;
 use cubesql::CubeError;
@@ -95,14 +95,19 @@ impl PyRuntime {
         let (fun, args, callback) = task.split();
 
         let task_result = Python::with_gil(move |py| -> PyResult<PyScheduledFunResult> {
-            let mut args_tuple = Vec::with_capacity(args.len());
+            let mut prep_tuple = Vec::with_capacity(args.len());
+            let mut py_kwargs = None;
 
             for arg in args {
-                args_tuple.push(arg.into_py(py)?);
+                if arg.is_kwarg() {
+                    py_kwargs = Some(arg.into_py_dict(py)?);
+                } else {
+                    prep_tuple.push(arg.into_py(py)?);
+                }
             }
 
-            let args = PyTuple::new(py, args_tuple);
-            let call_res = fun.call1(py, args)?;
+            let py_args = PyTuple::new(py, prep_tuple);
+            let call_res = fun.call(py, py_args, py_kwargs)?;
 
             let is_coroutine = unsafe { pyo3::ffi::PyCoro_CheckExact(call_res.as_ptr()) == 1 };
             if is_coroutine {
diff --git a/packages/cubejs-backend-native/src/template/entry.rs b/packages/cubejs-backend-native/src/template/entry.rs
index f56a14b7a9..212e12327a 100644
--- a/packages/cubejs-backend-native/src/template/entry.rs
+++ b/packages/cubejs-backend-native/src/template/entry.rs
@@ -110,7 +110,7 @@ impl JinjaEngine {
         let template_compile_context = CLRepr::from_js_ref(cx.argument::<JsValue>(1)?, &mut cx)?;
         let template_python_context = CLRepr::from_js_ref(cx.argument::<JsValue>(2)?, &mut cx)?;
 
-        let mut to_jinja_ctx = CLReprObject::new();
+        let mut to_jinja_ctx = CLReprObject::new(CLReprObjectKind::Object);
         to_jinja_ctx.insert("COMPILE_CONTEXT".to_string(), template_compile_context);
 
         if !template_python_context.is_null() {
diff --git a/packages/cubejs-backend-native/src/template/mj_value/python.rs b/packages/cubejs-backend-native/src/template/mj_value/python.rs
index 9fcd8783f7..510b121fa0 100644
--- a/packages/cubejs-backend-native/src/template/mj_value/python.rs
+++ b/packages/cubejs-backend-native/src/template/mj_value/python.rs
@@ -64,7 +64,11 @@ pub fn from_minijinja_value(from: &mjv::Value) -> Result<CLRepr, mj::Error> {
             Ok(CLRepr::Array(arr))
         }
         mjv::ValueKind::Map => {
-            let mut obj = CLReprObject::new();
+            let mut obj = CLReprObject::new(if from.is_kwargs() {
+                CLReprObjectKind::KWargs
+            } else {
+                CLReprObjectKind::Object
+            });
 
             for key in from.try_iter()? {
                 let value = if let Ok(v) = from.get_item(&key) {
diff --git a/packages/cubejs-backend-native/src/template/workers.rs b/packages/cubejs-backend-native/src/template/workers.rs
index 42d8d9b188..f486d8692c 100644
--- a/packages/cubejs-backend-native/src/template/workers.rs
+++ b/packages/cubejs-backend-native/src/template/workers.rs
@@ -51,9 +51,10 @@ impl JinjaEngineWorker {
                 );
             } else {
                 trace!(
-                    "Closing jinja thread, id: {}, threadId: {}",
+                    "Closing jinja thread, id: {}, threadId: {:?}",
                     id,
-                    std::thread::current().id().as_u64()
+                    // TODO: Use as_u64 when it will be stable - https://github.com/rust-lang/rust/issues/67939
+                    std::thread::current().id()
                 );
 
                 return;
diff --git a/packages/cubejs-backend-native/test/__snapshots__/jinja.test.ts.snap b/packages/cubejs-backend-native/test/__snapshots__/jinja.test.ts.snap
index c278af3fc3..85cf706de4 100644
--- a/packages/cubejs-backend-native/test/__snapshots__/jinja.test.ts.snap
+++ b/packages/cubejs-backend-native/test/__snapshots__/jinja.test.ts.snap
@@ -185,7 +185,12 @@ exports[`Jinja (new api) render arguments-test.yml.jinja: arguments-test.yml.jin
   arg_seq_1: [1,2,3,4,5]
   arg_seq_2: [5,4,3,2,1]
   arg_sum_tuple: 3
-  arg_sum_map: 20"
+  arg_sum_map: 20
+  arg_kwargs1: \\"arg1: first value, arg2: second value, kwarg:(three=3 arg)\\"
+  arg_kwargs2: \\"arg1: first value, arg2: second value, kwarg:(four=4 arg,three=3 arg)\\"
+  arg_kwargs3: \\"arg1: first value, arg2: second value, kwarg:(five=5 arg,four=4 arg,three=3 arg)\\"
+  arg_named_arguments1: \\"arg1: 1 arg, arg2: 2 arg\\"
+  arg_named_arguments2: \\"arg1: 1 arg, arg2: 2 arg\\""
 `;
 
 exports[`Jinja (new api) render data-model.yml.jinja: data-model.yml.jinja 1`] = `
@@ -249,7 +254,7 @@ dump:
 exports[`Jinja (new api) render template_error_python.jinja: template_error_python.jinja 1`] = `
 [Error: could not render block: Call error: Python error: Exception: Random Exception
 Traceback (most recent call last):
-  File "jinja-instance.py", line 110, in throw_exception
+  File "jinja-instance.py", line 120, in throw_exception
 
 ------------------------- template_error_python.jinja -------------------------
    3 | 3
diff --git a/packages/cubejs-backend-native/test/jinja.test.ts b/packages/cubejs-backend-native/test/jinja.test.ts
index 6a837070a8..d1a4e589b5 100644
--- a/packages/cubejs-backend-native/test/jinja.test.ts
+++ b/packages/cubejs-backend-native/test/jinja.test.ts
@@ -91,6 +91,8 @@ suite('Python model', () => {
       load_data: expect.any(Object),
       load_data_sync: expect.any(Object),
       arg_bool: expect.any(Object),
+      arg_kwargs: expect.any(Object),
+      arg_named_arguments: expect.any(Object),
       arg_sum_integers: expect.any(Object),
       arg_str: expect.any(Object),
       arg_null: expect.any(Object),
@@ -125,6 +127,8 @@ darwinSuite('Scope Python model', () => {
       load_data: expect.any(Object),
       load_data_sync: expect.any(Object),
       arg_bool: expect.any(Object),
+      arg_kwargs: expect.any(Object),
+      arg_named_arguments: expect.any(Object),
       arg_sum_integers: expect.any(Object),
       arg_str: expect.any(Object),
       arg_null: expect.any(Object),
diff --git a/packages/cubejs-backend-native/test/python.test.ts b/packages/cubejs-backend-native/test/python.test.ts
index 3fd261c894..0d2f08768d 100644
--- a/packages/cubejs-backend-native/test/python.test.ts
+++ b/packages/cubejs-backend-native/test/python.test.ts
@@ -213,6 +213,7 @@ darwinSuite('Old Python Config', () => {
       schemaPath: 'models',
       telemetry: false,
       contextToApiScopes: expect.any(Function),
+      extendContext: expect.any(Function),
       logger: expect.any(Function),
       pgSqlPort: 5555,
       preAggregationsSchema: expect.any(Function),
diff --git a/packages/cubejs-backend-native/test/templates/arguments-test.yml.jinja b/packages/cubejs-backend-native/test/templates/arguments-test.yml.jinja
index 7d96023c37..36cd13873b 100644
--- a/packages/cubejs-backend-native/test/templates/arguments-test.yml.jinja
+++ b/packages/cubejs-backend-native/test/templates/arguments-test.yml.jinja
@@ -15,3 +15,8 @@ test:
   arg_seq_2: {{ arg_seq(my_sequence_2) }}
   arg_sum_tuple: {{ arg_sum_tuple(my_int_tuple) }}
   arg_sum_map: {{ arg_sum_map(my_map) }}
+  arg_kwargs1: {{ arg_kwargs("first value", "second value", three="3 arg") }}
+  arg_kwargs2: {{ arg_kwargs("first value", "second value", three="3 arg", four="4 arg") }}
+  arg_kwargs3: {{ arg_kwargs("first value", "second value", three="3 arg", four="4 arg", five="5 arg") }}
+  arg_named_arguments1: {{ arg_named_arguments(arg2="2 arg", arg1="1 arg") }}
+  arg_named_arguments2: {{ arg_named_arguments(arg1="1 arg", arg2="2 arg") }}
diff --git a/packages/cubejs-backend-native/test/templates/jinja-instance.py b/packages/cubejs-backend-native/test/templates/jinja-instance.py
index 8d23bb107c..ac91f6fb35 100644
--- a/packages/cubejs-backend-native/test/templates/jinja-instance.py
+++ b/packages/cubejs-backend-native/test/templates/jinja-instance.py
@@ -33,6 +33,16 @@ def arg_sum_tuple(tu):
 def arg_sum_map(obj):
   return obj['field_a'] + obj['field_b']
 
+@template.function
+def arg_kwargs(arg1, arg2, **kwargs):
+    kwargs_str = ",".join(f"{key}={value}" for key, value in sorted(kwargs.items()))
+
+    return "arg1: " + arg1 + ", arg2: " + arg2 + ", kwarg:(" + kwargs_str + ")"
+
+@template.function
+def arg_named_arguments(arg1, arg2):
+    return "arg1: " + arg1 + ", arg2: " + arg2
+
 @template.function
 def arg_seq(a):
   return a
diff --git a/packages/cubejs-backend-native/test/templates/scoped-utils.py b/packages/cubejs-backend-native/test/templates/scoped-utils.py
index 8bb9e7ddec..9808728108 100644
--- a/packages/cubejs-backend-native/test/templates/scoped-utils.py
+++ b/packages/cubejs-backend-native/test/templates/scoped-utils.py
@@ -25,6 +25,16 @@ def arg_sum_tuple(tu):
 def arg_sum_map(obj):
   return obj['field_a'] + obj['field_b']
 
+@context_func
+def arg_kwargs(**kwargs):
+    kwargs_str = ",".join(f"{key}={value}" for key, value in sorted(kwargs.items()))
+
+    return "arg1: " + arg1 + ", arg2: " + arg2 + ", kwarg:(" + kwargs_str + ")"
+
+@context_func
+def arg_named_arguments(arg1, arg2):
+    return "arg1: " + arg1 + ", arg2: " + arg2
+
 @context_func
 def arg_seq(a):
   return a
diff --git a/packages/cubejs-backend-shared/CHANGELOG.md b/packages/cubejs-backend-shared/CHANGELOG.md
index b1644b1caf..8a33d9a5a2 100644
--- a/packages/cubejs-backend-shared/CHANGELOG.md
+++ b/packages/cubejs-backend-shared/CHANGELOG.md
@@ -3,6 +3,76 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+### Features
+
+- **server-core:** add fastReloadEnabled option to CompilerApi ([#9289](https://github.com/cube-js/cube/issues/9289)) ([122a3a3](https://github.com/cube-js/cube/commit/122a3a30e526f122d2bf2c0661f2b32fa070e824))
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/shared
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/shared
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/shared
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/shared
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/shared
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/shared
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/shared
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+### Features
+
+- **schema-compiler:** Boost models transpilation 10-13x times (using SWC instead of Babel) ([#9225](https://github.com/cube-js/cube/issues/9225)) ([2dd9a4a](https://github.com/cube-js/cube/commit/2dd9a4a5ba0f178e304befc476609fc30ada8975))
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/shared
+
+## [1.2.4](/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+### Features
+
+- **server-core:** Introduce CUBEJS_REFRESH_WORKER_CONCURRENCY env and update default concurrency settings for drivers (#9168) 7ef6282, closes #9168
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/shared
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+### Bug Fixes
+
+- **schema-compiler:** Fix queries with time dimensions without granularities don't hit pre-aggregations with allow_non_strict_date_range_match=true ([#9102](https://github.com/cube-js/cube/issues/9102)) ([eff0736](https://github.com/cube-js/cube/commit/eff073629261c687416a92b8876e46a522bdd1d8))
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+### Features
+
+- **schema-compiler:** Move transpiling to worker threads (under the flag) ([#9188](https://github.com/cube-js/cube/issues/9188)) ([7451452](https://github.com/cube-js/cube/commit/745145283b42c891e0e063c4cad1e2102c71616a))
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/shared
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Features
diff --git a/packages/cubejs-backend-shared/package.json b/packages/cubejs-backend-shared/package.json
index 64be9e7a0b..dcf05e7f3e 100644
--- a/packages/cubejs-backend-shared/package.json
+++ b/packages/cubejs-backend-shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-backend/shared",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "description": "Shared code for Cube.js backend packages",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -22,10 +22,10 @@
   "author": "Cube Dev, Inc.",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@types/bytes": "^3.1.0",
+    "@cubejs-backend/linter": "1.2.14",
+    "@types/bytes": "^3.1.5",
     "@types/cli-progress": "^3.9.1",
-    "@types/decompress": "^4.2.3",
+    "@types/decompress": "^4.2.7",
     "@types/jest": "^27",
     "@types/node": "^18",
     "@types/node-fetch": "^2.5.8",
@@ -36,15 +36,15 @@
   },
   "dependencies": {
     "@oclif/color": "^0.1.2",
-    "bytes": "^3.1.0",
+    "bytes": "^3.1.2",
     "cli-progress": "^3.9.0",
     "cross-spawn": "^7.0.3",
     "decompress": "^4.2.1",
     "env-var": "^6.3.0",
     "fs-extra": "^9.1.0",
     "http-proxy-agent": "^4.0.1",
-    "moment-range": "^4.0.1",
-    "moment-timezone": "^0.5.46",
+    "moment-range": "^4.0.2",
+    "moment-timezone": "^0.5.47",
     "node-fetch": "^2.6.1",
     "shelljs": "^0.8.5",
     "throttle-debounce": "^3.0.1",
diff --git a/packages/cubejs-backend-shared/src/env.ts b/packages/cubejs-backend-shared/src/env.ts
index 555171b13e..88af2878fb 100644
--- a/packages/cubejs-backend-shared/src/env.ts
+++ b/packages/cubejs-backend-shared/src/env.ts
@@ -170,6 +170,33 @@ const variables: Record<string, (...args: any) => any> = {
     // It's true by default for development
     return process.env.NODE_ENV !== 'production';
   },
+  scheduledRefreshQueriesPerAppId: () => {
+    const refreshQueries = get('CUBEJS_SCHEDULED_REFRESH_QUERIES_PER_APP_ID').asIntPositive();
+
+    if (refreshQueries) {
+      return refreshQueries;
+    }
+
+    const refreshConcurrency = get('CUBEJS_SCHEDULED_REFRESH_CONCURRENCY').asIntPositive();
+
+    if (refreshConcurrency) {
+      console.warn(
+        'The CUBEJS_SCHEDULED_REFRESH_CONCURRENCY is deprecated. Please, use the CUBEJS_SCHEDULED_REFRESH_QUERIES_PER_APP_ID instead.'
+      );
+    }
+
+    return refreshConcurrency;
+  },
+  refreshWorkerConcurrency: () => get('CUBEJS_REFRESH_WORKER_CONCURRENCY')
+    .asIntPositive(),
+  // eslint-disable-next-line consistent-return
+  scheduledRefreshTimezones: () => {
+    const timezones = get('CUBEJS_SCHEDULED_REFRESH_TIMEZONES').asString();
+
+    if (timezones) {
+      return timezones.split(',').map(t => t.trim());
+    }
+  },
   preAggregationsBuilder: () => get('CUBEJS_PRE_AGGREGATIONS_BUILDER').asBool(),
   gracefulShutdown: () => get('CUBEJS_GRACEFUL_SHUTDOWN')
     .asIntPositive(),
@@ -196,6 +223,16 @@ const variables: Record<string, (...args: any) => any> = {
   nativeOrchestrator: () => get('CUBEJS_TESSERACT_ORCHESTRATOR')
     .default('false')
     .asBoolStrict(),
+  transpilationWorkerThreads: () => get('CUBEJS_TRANSPILATION_WORKER_THREADS')
+    .default('false')
+    .asBoolStrict(),
+  transpilationWorkerThreadsCount: () => get('CUBEJS_TRANSPILATION_WORKER_THREADS_COUNT')
+    .default('0')
+    .asInt(),
+  // This one takes precedence over CUBEJS_TRANSPILATION_WORKER_THREADS
+  transpilationNative: () => get('CUBEJS_TRANSPILATION_NATIVE')
+    .default('false')
+    .asBoolStrict(),
 
   /** ****************************************************************
    * Common db options                                               *
@@ -1926,6 +1963,9 @@ const variables: Record<string, (...args: any) => any> = {
 
     return undefined;
   },
+  fastReloadEnabled: () => get('CUBEJS_FAST_RELOAD_ENABLED')
+    .default('false')
+    .asBoolStrict(),
 };
 
 type Vars = typeof variables;
diff --git a/packages/cubejs-backend-shared/src/promises.ts b/packages/cubejs-backend-shared/src/promises.ts
index 81e9f76909..d458296060 100644
--- a/packages/cubejs-backend-shared/src/promises.ts
+++ b/packages/cubejs-backend-shared/src/promises.ts
@@ -122,7 +122,7 @@ export interface CancelableIntervalOptions {
 }
 
 /**
- * It's helps to create an interval that can be canceled with awaiting latest execution
+ * It helps to create an interval that can be canceled with awaiting latest execution
  */
 export function createCancelableInterval<T>(
   fn: (token: CancelToken) => Promise<T>,
diff --git a/packages/cubejs-backend-shared/src/time.ts b/packages/cubejs-backend-shared/src/time.ts
index 2d795cf074..f6277de9fa 100644
--- a/packages/cubejs-backend-shared/src/time.ts
+++ b/packages/cubejs-backend-shared/src/time.ts
@@ -1,9 +1,9 @@
-import { DateRange, extendMoment } from 'moment-range';
-import { unitOfTime } from 'moment-timezone';
+import type { unitOfTime } from 'moment-timezone';
+import type { DateRange } from 'moment-range';
+import Moment from 'moment-timezone';
+import { extendMoment } from 'moment-range';
 
-const Moment = require('moment-timezone');
-
-const moment = extendMoment(Moment);
+const moment = extendMoment(Moment as any);
 
 export type QueryDateRange = [string, string];
 type SqlInterval = string;
@@ -76,7 +76,7 @@ export function subtractInterval(date: moment.Moment, interval: ParsedInterval):
 /**
  * Returns the closest date prior to date parameter aligned with the origin point
  */
-function alignToOrigin(startDate: moment.Moment, interval: ParsedInterval, origin: moment.Moment): moment.Moment {
+export const alignToOrigin = (startDate: moment.Moment, interval: ParsedInterval, origin: moment.Moment): moment.Moment => {
   let alignedDate = startDate.clone();
   let intervalOp;
   let isIntervalNegative = false;
@@ -111,9 +111,9 @@ function alignToOrigin(startDate: moment.Moment, interval: ParsedInterval, origi
   }
 
   return alignedDate;
-}
+};
 
-function parsedSqlIntervalToDuration(parsedInterval: ParsedInterval): moment.Duration {
+export const parsedSqlIntervalToDuration = (parsedInterval: ParsedInterval): moment.Duration => {
   const duration = moment.duration();
 
   Object.entries(parsedInterval).forEach(([key, value]) => {
@@ -121,7 +121,7 @@ function parsedSqlIntervalToDuration(parsedInterval: ParsedInterval): moment.Dur
   });
 
   return duration;
-}
+};
 
 function checkSeriesForDateRange(intervalStr: string, [startStr, endStr]: QueryDateRange): void {
   const intervalParsed = parseSqlInterval(intervalStr);
@@ -236,11 +236,11 @@ export const utcToLocalTimeZone = (timezone: string, timestampFormat: string, ti
     const parsedTime = Date.parse(`${timestamp}Z`);
     // TODO parsedTime might be incorrect offset for conversion
     const offset = zone.utcOffset(parsedTime);
-    const inDbTimeZoneDate = new Date(parsedTime - offset * 60 * 1000);
+    const localTimeZoneDate = new Date(parsedTime - offset * 60 * 1000);
     if (timestampFormat === 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]' || timestampFormat === 'YYYY-MM-DDTHH:mm:ss.SSSZ') {
-      return inDbTimeZoneDate.toJSON();
+      return localTimeZoneDate.toJSON();
     } else if (timestampFormat === 'YYYY-MM-DDTHH:mm:ss.SSS') {
-      return inDbTimeZoneDate.toJSON().replace('Z', '');
+      return localTimeZoneDate.toJSON().replace('Z', '');
     }
   }
 
diff --git a/packages/cubejs-base-driver/CHANGELOG.md b/packages/cubejs-base-driver/CHANGELOG.md
index 7e36c2c713..73b7d96c5c 100644
--- a/packages/cubejs-base-driver/CHANGELOG.md
+++ b/packages/cubejs-base-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Features
diff --git a/packages/cubejs-base-driver/package.json b/packages/cubejs-base-driver/package.json
index 50e04e1d3b..c14813e614 100644
--- a/packages/cubejs-base-driver/package.json
+++ b/packages/cubejs-base-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/base-driver",
   "description": "Cube.js Base Driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -33,11 +33,11 @@
     "@aws-sdk/s3-request-presigner": "^3.49.0",
     "@azure/identity": "^4.4.1",
     "@azure/storage-blob": "^12.9.0",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/shared": "1.2.14",
     "@google-cloud/storage": "^7.13.0"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/jest": "^27",
     "@types/node": "^18",
     "jest": "^27",
@@ -59,10 +59,6 @@
     ],
     "testEnvironment": "node"
   },
-  "resolutions": {
-    "es5-ext": "0.10.53",
-    "minimist": "^1.2.6"
-  },
   "publishConfig": {
     "access": "public"
   }
diff --git a/packages/cubejs-bigquery-driver/CHANGELOG.md b/packages/cubejs-bigquery-driver/CHANGELOG.md
index cf84e60095..e53524c3d3 100644
--- a/packages/cubejs-bigquery-driver/CHANGELOG.md
+++ b/packages/cubejs-bigquery-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/bigquery-driver
diff --git a/packages/cubejs-bigquery-driver/package.json b/packages/cubejs-bigquery-driver/package.json
index 60e43e2f68..e7e0656a12 100644
--- a/packages/cubejs-bigquery-driver/package.json
+++ b/packages/cubejs-bigquery-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/bigquery-driver",
   "description": "Cube.js BigQuery database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -28,15 +28,15 @@
   "main": "index.js",
   "types": "dist/src/index.d.ts",
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
     "@cubejs-backend/dotenv": "^9.0.2",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/shared": "1.2.14",
     "@google-cloud/bigquery": "^7.7.0",
     "@google-cloud/storage": "^7.13.0",
     "ramda": "^0.27.2"
   },
   "devDependencies": {
-    "@cubejs-backend/testing-shared": "1.1.17",
+    "@cubejs-backend/testing-shared": "1.2.14",
     "@types/big.js": "^6.2.2",
     "@types/dedent": "^0.7.0",
     "@types/jest": "^27",
diff --git a/packages/cubejs-cli/CHANGELOG.md b/packages/cubejs-cli/CHANGELOG.md
index 7465035e34..f68e51a72a 100644
--- a/packages/cubejs-cli/CHANGELOG.md
+++ b/packages/cubejs-cli/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package cubejs-cli
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package cubejs-cli
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package cubejs-cli
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package cubejs-cli
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package cubejs-cli
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package cubejs-cli
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package cubejs-cli
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package cubejs-cli
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package cubejs-cli
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package cubejs-cli
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package cubejs-cli
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package cubejs-cli
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package cubejs-cli
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package cubejs-cli
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package cubejs-cli
+
 ## [1.1.18](https://github.com/cube-js/cube/compare/v1.1.17...v1.1.18) (2025-01-27)
 
 **Note:** Version bump only for package cubejs-cli
diff --git a/packages/cubejs-cli/package.json b/packages/cubejs-cli/package.json
index 75dbf0c066..e9a3a4f265 100644
--- a/packages/cubejs-cli/package.json
+++ b/packages/cubejs-cli/package.json
@@ -2,7 +2,7 @@
   "name": "cubejs-cli",
   "description": "Cube.js Command Line Interface",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.18",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -30,10 +30,10 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@cubejs-backend/cloud": "1.1.17",
+    "@cubejs-backend/cloud": "1.2.14",
     "@cubejs-backend/dotenv": "^9.0.2",
-    "@cubejs-backend/schema-compiler": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/schema-compiler": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "chalk": "^2.4.2",
     "cli-progress": "^3.10",
     "commander": "^2.19.0",
@@ -50,8 +50,8 @@
     "colors": "1.4.0"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/server": "1.1.18",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/server": "1.2.14",
     "@oclif/command": "^1.8.0",
     "@types/cli-progress": "^3.8.0",
     "@types/cross-spawn": "^6.0.2",
diff --git a/packages/cubejs-clickhouse-driver/CHANGELOG.md b/packages/cubejs-clickhouse-driver/CHANGELOG.md
index 1318b7bb32..9d2e15afb6 100644
--- a/packages/cubejs-clickhouse-driver/CHANGELOG.md
+++ b/packages/cubejs-clickhouse-driver/CHANGELOG.md
@@ -3,6 +3,68 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+### Features
+
+- **server-core:** Introduce CUBEJS_REFRESH_WORKER_CONCURRENCY env and update default concurrency settings for drivers ([#9168](https://github.com/cube-js/cube/issues/9168)) ([7ef6282](https://github.com/cube-js/cube/commit/7ef628273905d47996b108862a52dde89b9525e3))
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/clickhouse-driver
diff --git a/packages/cubejs-clickhouse-driver/package.json b/packages/cubejs-clickhouse-driver/package.json
index b3ed0f2cbd..0a5f80ba6d 100644
--- a/packages/cubejs-clickhouse-driver/package.json
+++ b/packages/cubejs-clickhouse-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/clickhouse-driver",
   "description": "Cube.js ClickHouse database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -28,18 +28,18 @@
   },
   "dependencies": {
     "@clickhouse/client": "^1.7.0",
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "moment": "^2.24.0",
     "sqlstring": "^2.3.1",
     "uuid": "^8.3.2"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/testing-shared": "1.1.17",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/testing-shared": "1.2.14",
     "@types/jest": "^27",
-    "jest": "27",
+    "jest": "^27",
     "typescript": "~5.2.2"
   },
   "publishConfig": {
diff --git a/packages/cubejs-clickhouse-driver/src/ClickHouseDriver.ts b/packages/cubejs-clickhouse-driver/src/ClickHouseDriver.ts
index 6ef8ba7cd9..19a2f037c2 100644
--- a/packages/cubejs-clickhouse-driver/src/ClickHouseDriver.ts
+++ b/packages/cubejs-clickhouse-driver/src/ClickHouseDriver.ts
@@ -119,7 +119,7 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
    * Returns default concurrency value.
    */
   public static getDefaultConcurrency(): number {
-    return 5;
+    return 10;
   }
 
   // ClickHouseClient has internal pool of several sockets, no need for generic-pool
diff --git a/packages/cubejs-client-core/CHANGELOG.md b/packages/cubejs-client-core/CHANGELOG.md
index bb2225aa9d..0c203fc702 100644
--- a/packages/cubejs-client-core/CHANGELOG.md
+++ b/packages/cubejs-client-core/CHANGELOG.md
@@ -3,2215 +3,1269 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.1.12](https://github.com/cube-js/cube/compare/v1.1.11...v1.1.12) (2025-01-09)
-
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
 
-### Bug Fixes
+**Note:** Version bump only for package @cubejs-client/core
 
-* **cubejs-client-core:** hierarchy typings ([#9042](https://github.com/cube-js/cube/issues/9042)) ([7c38845](https://github.com/cube-js/cube/commit/7c38845388fde0939423f0c35cf65cf1d67c1c36))
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
 
+**Note:** Version bump only for package @cubejs-client/core
 
-### Features
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
 
-* **cubejs-client-core:** Fill missing dates with custom measure value ([#8843](https://github.com/cube-js/cube/issues/8843)) ([ed3f6c9](https://github.com/cube-js/cube/commit/ed3f6c9b00f48889843080e800e4321d939ce5ec))
+**Note:** Version bump only for package @cubejs-client/core
 
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
 
+**Note:** Version bump only for package @cubejs-client/core
 
-# [1.0.0](https://github.com/cube-js/cube/compare/v0.36.11...v1.0.0) (2024-10-15)
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
 
 **Note:** Version bump only for package @cubejs-client/core
 
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
 
+**Note:** Version bump only for package @cubejs-client/core
 
-## [0.36.4](https://github.com/cube-js/cube/compare/v0.36.3...v0.36.4) (2024-09-27)
-
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
 
-### Features
+**Note:** Version bump only for package @cubejs-client/core
 
-* **client-core:** timeseries for custom intervals ([#8742](https://github.com/cube-js/cube/issues/8742)) ([ae989e1](https://github.com/cube-js/cube/commit/ae989e131d84e4926b8d9fd7588ec42d23e9bdda))
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
 
-## [0.36.2](https://github.com/cube-js/cube/compare/v0.36.1...v0.36.2) (2024-09-18)
+**Note:** Version bump only for package @cubejs-client/core
 
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
 
-### Features
+**Note:** Version bump only for package @cubejs-client/core
 
-* **client-core:** extend client types with custom granularity support ([#8724](https://github.com/cube-js/cube/issues/8724)) ([21a63e2](https://github.com/cube-js/cube/commit/21a63e2d415b731fe01aa5fb4b693c9e0991b2be))
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [1.1.12](https://github.com/cube-js/cube/compare/v1.1.11...v1.1.12) (2025-01-09)
 
-# [0.36.0](https://github.com/cube-js/cube/compare/v0.35.81...v0.36.0) (2024-09-13)
+### Bug Fixes
 
+- **cubejs-client-core:** hierarchy typings ([#9042](https://github.com/cube-js/cube/issues/9042)) ([7c38845](https://github.com/cube-js/cube/commit/7c38845388fde0939423f0c35cf65cf1d67c1c36))
 
 ### Features
 
-* **schema-compiler:** custom granularity support ([#8537](https://github.com/cube-js/cube/issues/8537)) ([2109849](https://github.com/cube-js/cube/commit/21098494353b9b6274b534b6c656154cb8451c7b))
-
-
+- **cubejs-client-core:** Fill missing dates with custom measure value ([#8843](https://github.com/cube-js/cube/issues/8843)) ([ed3f6c9](https://github.com/cube-js/cube/commit/ed3f6c9b00f48889843080e800e4321d939ce5ec))
 
+# [1.0.0](https://github.com/cube-js/cube/compare/v0.36.11...v1.0.0) (2024-10-15)
 
+**Note:** Version bump only for package @cubejs-client/core
 
-## [0.35.23](https://github.com/cube-js/cube/compare/v0.35.22...v0.35.23) (2024-04-25)
+## [0.36.4](https://github.com/cube-js/cube/compare/v0.36.3...v0.36.4) (2024-09-27)
 
+### Features
 
-### Bug Fixes
+- **client-core:** timeseries for custom intervals ([#8742](https://github.com/cube-js/cube/issues/8742)) ([ae989e1](https://github.com/cube-js/cube/commit/ae989e131d84e4926b8d9fd7588ec42d23e9bdda))
 
-* **client-core:** castNumerics option for CubeApi ([#8186](https://github.com/cube-js/cube/issues/8186)) ([6ff2208](https://github.com/cube-js/cube/commit/6ff22088ede88521c6c5a5e8cb1a77c819301ad4))
+## [0.36.2](https://github.com/cube-js/cube/compare/v0.36.1...v0.36.2) (2024-09-18)
 
+### Features
 
+- **client-core:** extend client types with custom granularity support ([#8724](https://github.com/cube-js/cube/issues/8724)) ([21a63e2](https://github.com/cube-js/cube/commit/21a63e2d415b731fe01aa5fb4b693c9e0991b2be))
 
+# [0.36.0](https://github.com/cube-js/cube/compare/v0.35.81...v0.36.0) (2024-09-13)
 
+### Features
 
-# [0.35.0](https://github.com/cube-js/cube/compare/v0.34.62...v0.35.0) (2024-03-14)
+- **schema-compiler:** custom granularity support ([#8537](https://github.com/cube-js/cube/issues/8537)) ([2109849](https://github.com/cube-js/cube/commit/21098494353b9b6274b534b6c656154cb8451c7b))
 
-**Note:** Version bump only for package @cubejs-client/core
+## [0.35.23](https://github.com/cube-js/cube/compare/v0.35.22...v0.35.23) (2024-04-25)
 
+### Bug Fixes
 
+- **client-core:** castNumerics option for CubeApi ([#8186](https://github.com/cube-js/cube/issues/8186)) ([6ff2208](https://github.com/cube-js/cube/commit/6ff22088ede88521c6c5a5e8cb1a77c819301ad4))
 
+# [0.35.0](https://github.com/cube-js/cube/compare/v0.34.62...v0.35.0) (2024-03-14)
 
+**Note:** Version bump only for package @cubejs-client/core
 
 ## [0.34.60](https://github.com/cube-js/cube/compare/v0.34.59...v0.34.60) (2024-03-02)
 
-
 ### Bug Fixes
 
-* **client-core:** incorrect index in movePivotItem ([#6684](https://github.com/cube-js/cube/issues/6684)) Thanks to [@telunc](https://github.com/telunc)! ([82217b2](https://github.com/cube-js/cube/commit/82217b28a012158cd8a978fd2e1ad15746ddeae0))
-
-
-
-
+- **client-core:** incorrect index in movePivotItem ([#6684](https://github.com/cube-js/cube/issues/6684)) Thanks to [@telunc](https://github.com/telunc)! ([82217b2](https://github.com/cube-js/cube/commit/82217b28a012158cd8a978fd2e1ad15746ddeae0))
 
 ## [0.34.37](https://github.com/cube-js/cube/compare/v0.34.36...v0.34.37) (2023-12-19)
 
-
 ### Features
 
-* **client-core:** Add meta field for Cube type definition ([#7527](https://github.com/cube-js/cube/issues/7527)) ([75e201d](https://github.com/cube-js/cube/commit/75e201df5b64538da24103ccf82411b6f46006da))
-
-
-
-
+- **client-core:** Add meta field for Cube type definition ([#7527](https://github.com/cube-js/cube/issues/7527)) ([75e201d](https://github.com/cube-js/cube/commit/75e201df5b64538da24103ccf82411b6f46006da))
 
 ## [0.34.32](https://github.com/cube-js/cube/compare/v0.34.31...v0.34.32) (2023-12-07)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.34.27](https://github.com/cube-js/cube/compare/v0.34.26...v0.34.27) (2023-11-30)
 
-
 ### Features
 
-* **client-ngx:** enable ivy ([#7479](https://github.com/cube-js/cube/issues/7479)) ([a3c2bbb](https://github.com/cube-js/cube/commit/a3c2bbb760a166d796f4080913bdfc1d352af8bd))
-
-
-
-
+- **client-ngx:** enable ivy ([#7479](https://github.com/cube-js/cube/issues/7479)) ([a3c2bbb](https://github.com/cube-js/cube/commit/a3c2bbb760a166d796f4080913bdfc1d352af8bd))
 
 ## [0.34.24](https://github.com/cube-js/cube/compare/v0.34.23...v0.34.24) (2023-11-23)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.34.19](https://github.com/cube-js/cube/compare/v0.34.18...v0.34.19) (2023-11-11)
 
-
 ### Bug Fixes
 
-* support for format in typings for measures ([#7401](https://github.com/cube-js/cube/issues/7401)) ([1f7e1b3](https://github.com/cube-js/cube/commit/1f7e1b300f06a1b53adfa2850314bd9f145f6651))
-
+- support for format in typings for measures ([#7401](https://github.com/cube-js/cube/issues/7401)) ([1f7e1b3](https://github.com/cube-js/cube/commit/1f7e1b300f06a1b53adfa2850314bd9f145f6651))
 
 ### Features
 
-* **@cubejs-client/core:** expose total rows ([#7140](https://github.com/cube-js/cube/issues/7140)) ([#7372](https://github.com/cube-js/cube/issues/7372)) Thanks [@hannosgit](https://github.com/hannosgit)! ([a4d08c9](https://github.com/cube-js/cube/commit/a4d08c961c3dad880c9a00df630e6f27917f1898))
-
-
-
-
+- **@cubejs-client/core:** expose total rows ([#7140](https://github.com/cube-js/cube/issues/7140)) ([#7372](https://github.com/cube-js/cube/issues/7372)) Thanks [@hannosgit](https://github.com/hannosgit)! ([a4d08c9](https://github.com/cube-js/cube/commit/a4d08c961c3dad880c9a00df630e6f27917f1898))
 
 ## [0.34.9](https://github.com/cube-js/cube/compare/v0.34.8...v0.34.9) (2023-10-26)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.34.2](https://github.com/cube-js/cube/compare/v0.34.1...v0.34.2) (2023-10-12)
 
-
 ### Bug Fixes
 
-* **playground:** rollup designer view members ([#7214](https://github.com/cube-js/cube/issues/7214)) ([b08e27b](https://github.com/cube-js/cube/commit/b08e27b7dc48427a745adccfd03d92088b78dc72))
-
-
-
-
+- **playground:** rollup designer view members ([#7214](https://github.com/cube-js/cube/issues/7214)) ([b08e27b](https://github.com/cube-js/cube/commit/b08e27b7dc48427a745adccfd03d92088b78dc72))
 
 # [0.34.0](https://github.com/cube-js/cube/compare/v0.33.65...v0.34.0) (2023-10-03)
 
 **Note:** Version bump only for package @cubejs-client/core
 
+## [0.33.59](https://github.com/cube-js/cube/compare/v0.33.58...v0.33.59) (2023-09-20)
 
+### Features
 
+- **cubesql:** Add ability to filter dates inclusive of date being passed in when using `<=` or `>=` ([#7041](https://github.com/cube-js/cube/issues/7041)) Thanks [@darapuk](https://github.com/darapuk) ! ([6b9ae70](https://github.com/cube-js/cube/commit/6b9ae703b113a01fa4e6de54b5597475aed0b85d))
 
+## [0.33.58](https://github.com/cube-js/cube/compare/v0.33.57...v0.33.58) (2023-09-18)
 
-## [0.33.59](https://github.com/cube-js/cube/compare/v0.33.58...v0.33.59) (2023-09-20)
+### Bug Fixes
 
+- **cubejs-client/core:** drillDown - check dateRange before destructuring ([#7138](https://github.com/cube-js/cube/issues/7138)) ([21a7cc2](https://github.com/cube-js/cube/commit/21a7cc2e852366ca224bf84e968c90c30e5e2332))
+
+## [0.33.55](https://github.com/cube-js/cube/compare/v0.33.54...v0.33.55) (2023-09-12)
 
 ### Features
 
-* **cubesql:** Add ability to filter dates inclusive of date being passed in when using `<=` or `>=` ([#7041](https://github.com/cube-js/cube/issues/7041)) Thanks [@darapuk](https://github.com/darapuk) ! ([6b9ae70](https://github.com/cube-js/cube/commit/6b9ae703b113a01fa4e6de54b5597475aed0b85d))
+- **client-core:** castNumerics option ([#7123](https://github.com/cube-js/cube/issues/7123)) ([9aed9ac](https://github.com/cube-js/cube/commit/9aed9ac2c271d064888db6f3fe726dac350b52ea))
 
+## [0.33.47](https://github.com/cube-js/cube/compare/v0.33.46...v0.33.47) (2023-08-15)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.33.44](https://github.com/cube-js/cube/compare/v0.33.43...v0.33.44) (2023-08-11)
 
+### Features
 
-## [0.33.58](https://github.com/cube-js/cube/compare/v0.33.57...v0.33.58) (2023-09-18)
+- **client-core:** Add Meta to export ([#6988](https://github.com/cube-js/cube/issues/6988)) Thanks [@philipprus](https://github.com/philipprus)! ([1f2443c](https://github.com/cube-js/cube/commit/1f2443c073b383ed5993afdc348b1ba599443619))
 
+## [0.33.12](https://github.com/cube-js/cube/compare/v0.33.11...v0.33.12) (2023-05-22)
 
 ### Bug Fixes
 
-* **cubejs-client/core:** drillDown - check dateRange before destructuring ([#7138](https://github.com/cube-js/cube/issues/7138)) ([21a7cc2](https://github.com/cube-js/cube/commit/21a7cc2e852366ca224bf84e968c90c30e5e2332))
-
-
-
+- **client-core:** drill down check the parent date range bounds ([#6639](https://github.com/cube-js/cube/issues/6639)) ([5da5e61](https://github.com/cube-js/cube/commit/5da5e613c4551f09f72ba89e4432534ab1524eaa))
 
+# [0.33.0](https://github.com/cube-js/cube/compare/v0.32.31...v0.33.0) (2023-05-02)
 
-## [0.33.55](https://github.com/cube-js/cube/compare/v0.33.54...v0.33.55) (2023-09-12)
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.32.30](https://github.com/cube-js/cube/compare/v0.32.29...v0.32.30) (2023-04-28)
 
 ### Features
 
-* **client-core:** castNumerics option ([#7123](https://github.com/cube-js/cube/issues/7123)) ([9aed9ac](https://github.com/cube-js/cube/commit/9aed9ac2c271d064888db6f3fe726dac350b52ea))
-
-
+- **playground:** cube type tag, public cubes ([#6482](https://github.com/cube-js/cube/issues/6482)) ([cede7a7](https://github.com/cube-js/cube/commit/cede7a71f7d2e8d9dc221669b6b1714ee146d8ea))
 
+## [0.32.22](https://github.com/cube-js/cube/compare/v0.32.21...v0.32.22) (2023-04-10)
 
+**Note:** Version bump only for package @cubejs-client/core
 
-## [0.33.47](https://github.com/cube-js/cube/compare/v0.33.46...v0.33.47) (2023-08-15)
+## [0.32.17](https://github.com/cube-js/cube/compare/v0.32.16...v0.32.17) (2023-03-29)
 
 **Note:** Version bump only for package @cubejs-client/core
 
+## [0.32.12](https://github.com/cube-js/cube/compare/v0.32.11...v0.32.12) (2023-03-22)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+# [0.32.0](https://github.com/cube-js/cube.js/compare/v0.31.69...v0.32.0) (2023-03-02)
 
+**Note:** Version bump only for package @cubejs-client/core
 
-## [0.33.44](https://github.com/cube-js/cube/compare/v0.33.43...v0.33.44) (2023-08-11)
-
+## [0.31.63](https://github.com/cube-js/cube.js/compare/v0.31.62...v0.31.63) (2023-02-20)
 
 ### Features
 
-* **client-core:** Add Meta to export ([#6988](https://github.com/cube-js/cube/issues/6988)) Thanks [@philipprus](https://github.com/philipprus)! ([1f2443c](https://github.com/cube-js/cube/commit/1f2443c073b383ed5993afdc348b1ba599443619))
+- graphql api variables ([#6153](https://github.com/cube-js/cube.js/issues/6153)) ([5f0f705](https://github.com/cube-js/cube.js/commit/5f0f7053022f437e61d23739b9acfb364fb06a16))
 
+## [0.31.46](https://github.com/cube-js/cube.js/compare/v0.31.45...v0.31.46) (2023-01-18)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.31.35](https://github.com/cube-js/cube.js/compare/v0.31.34...v0.31.35) (2023-01-07)
 
+### Bug Fixes
 
-## [0.33.12](https://github.com/cube-js/cube/compare/v0.33.11...v0.33.12) (2023-05-22)
+- **client-core:** Added type CubesMap for cubeMap in Meta ([#5897](https://github.com/cube-js/cube.js/issues/5897)) ([92d1ccb](https://github.com/cube-js/cube.js/commit/92d1ccb9166e3a608424a1e11457f1746119e5f2))
 
+## [0.31.34](https://github.com/cube-js/cube.js/compare/v0.31.33...v0.31.34) (2023-01-05)
 
 ### Bug Fixes
 
-* **client-core:** drill down check the parent date range bounds ([#6639](https://github.com/cube-js/cube/issues/6639)) ([5da5e61](https://github.com/cube-js/cube/commit/5da5e613c4551f09f72ba89e4432534ab1524eaa))
-
-
+- **client-core:** move @babel/runtime to dependencies ([#5917](https://github.com/cube-js/cube.js/issues/5917)) ([67221af](https://github.com/cube-js/cube.js/commit/67221afa040bb71381369306b3cc9b5067094589))
 
+## [0.31.33](https://github.com/cube-js/cube.js/compare/v0.31.32...v0.31.33) (2023-01-03)
 
+### Bug Fixes
 
-# [0.33.0](https://github.com/cube-js/cube/compare/v0.32.31...v0.33.0) (2023-05-02)
+- **@cubejs-client/core:** add missing Series.shortTitle typing ([#5860](https://github.com/cube-js/cube.js/issues/5860)) ([5dd78b9](https://github.com/cube-js/cube.js/commit/5dd78b9544965304757c72d8f305741f78bfc935))
 
-**Note:** Version bump only for package @cubejs-client/core
+## [0.31.30](https://github.com/cube-js/cube.js/compare/v0.31.29...v0.31.30) (2022-12-22)
 
+### Features
 
+- **@cubejs-client/core:** expose shortTitle in seriesNames ([#5836](https://github.com/cube-js/cube.js/issues/5836)) Thanks [@euljr](https://github.com/euljr) ! ([1058d5a](https://github.com/cube-js/cube.js/commit/1058d5afd2784302b23215d73c679d35ceb785a8))
 
+## [0.31.15](https://github.com/cube-js/cube.js/compare/v0.31.14...v0.31.15) (2022-11-17)
 
+### Bug Fixes
 
-## [0.32.30](https://github.com/cube-js/cube/compare/v0.32.29...v0.32.30) (2023-04-28)
+- packages/cubejs-client-core/package.json to reduce vulnerabilities ([#5415](https://github.com/cube-js/cube.js/issues/5415)) ([fb2de68](https://github.com/cube-js/cube.js/commit/fb2de682670bd28b2879d0460fac990d9b653dce))
 
+## [0.31.13](https://github.com/cube-js/cube.js/compare/v0.31.12...v0.31.13) (2022-11-08)
 
 ### Features
 
-* **playground:** cube type tag, public cubes ([#6482](https://github.com/cube-js/cube/issues/6482)) ([cede7a7](https://github.com/cube-js/cube/commit/cede7a71f7d2e8d9dc221669b6b1714ee146d8ea))
-
+- notStartsWith/notEndsWith filters support ([#5579](https://github.com/cube-js/cube.js/issues/5579)) ([8765833](https://github.com/cube-js/cube.js/commit/87658333df0194db07c3ce0ae6f94a292f8bd592))
 
+## [0.31.9](https://github.com/cube-js/cube.js/compare/v0.31.8...v0.31.9) (2022-11-01)
 
+### Bug Fixes
 
+- **@cubejs-client/core:** `startsWith` and `endsWith` to filterOperatorsForMember ([#5544](https://github.com/cube-js/cube.js/issues/5544)) ([583de4a](https://github.com/cube-js/cube.js/commit/583de4a58c841542f3138c5ce836dbfedd19d4de))
 
-## [0.32.22](https://github.com/cube-js/cube/compare/v0.32.21...v0.32.22) (2023-04-10)
+## [0.31.8](https://github.com/cube-js/cube.js/compare/v0.31.7...v0.31.8) (2022-10-30)
 
 **Note:** Version bump only for package @cubejs-client/core
 
+# [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.30.74](https://github.com/cube-js/cube.js/compare/v0.30.73...v0.30.74) (2022-09-20)
 
+**Note:** Version bump only for package @cubejs-client/core
 
-## [0.32.17](https://github.com/cube-js/cube/compare/v0.32.16...v0.32.17) (2023-03-29)
+## [0.30.64](https://github.com/cube-js/cube.js/compare/v0.30.63...v0.30.64) (2022-09-07)
 
 **Note:** Version bump only for package @cubejs-client/core
 
+## [0.30.60](https://github.com/cube-js/cube.js/compare/v0.30.59...v0.30.60) (2022-08-28)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.30.46](https://github.com/cube-js/cube.js/compare/v0.30.45...v0.30.46) (2022-08-10)
 
+### Bug Fixes
 
-## [0.32.12](https://github.com/cube-js/cube/compare/v0.32.11...v0.32.12) (2023-03-22)
+- **client-core:** Fix a type inference failure ([#5067](https://github.com/cube-js/cube.js/issues/5067)) ([794708e](https://github.com/cube-js/cube.js/commit/794708e7ea3d540afdd86c58b32bab1c6a0d89c4))
 
-**Note:** Version bump only for package @cubejs-client/core
+## [0.30.29](https://github.com/cube-js/cube.js/compare/v0.30.28...v0.30.29) (2022-07-01)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.30.4](https://github.com/cube-js/cube.js/compare/v0.30.3...v0.30.4) (2022-05-20)
 
+### Bug Fixes
 
+- **playground:** Remove all time time dimension without granularity ([#4564](https://github.com/cube-js/cube.js/issues/4564)) ([054f488](https://github.com/cube-js/cube.js/commit/054f488ce6b8bfa103cd435f99178ca1f2fa38c7))
 
-# [0.32.0](https://github.com/cube-js/cube.js/compare/v0.31.69...v0.32.0) (2023-03-02)
+# [0.30.0](https://github.com/cube-js/cube.js/compare/v0.29.57...v0.30.0) (2022-05-11)
 
 **Note:** Version bump only for package @cubejs-client/core
 
+## [0.29.54](https://github.com/cube-js/cube.js/compare/v0.29.53...v0.29.54) (2022-05-03)
 
+### Features
 
+- Detailed client TS types ([#4446](https://github.com/cube-js/cube.js/issues/4446)) Thanks [@reify-thomas-smith](https://github.com/reify-thomas-smith) ! ([977cce0](https://github.com/cube-js/cube.js/commit/977cce0c440bc73c0e6b5ad0c10af926b7386873)), closes [#4202](https://github.com/cube-js/cube.js/issues/4202)
 
+## [0.29.53](https://github.com/cube-js/cube.js/compare/v0.29.52...v0.29.53) (2022-04-29)
 
-## [0.31.63](https://github.com/cube-js/cube.js/compare/v0.31.62...v0.31.63) (2023-02-20)
+### Bug Fixes
 
+- **@cubejs-client/core:** Correct LogicalAndFilter/LogicalOrFilter types: allow any filter types in and / or ([#4343](https://github.com/cube-js/cube.js/issues/4343)) Thanks [@tchell](https://github.com/tchell) ! ([699a2f4](https://github.com/cube-js/cube.js/commit/699a2f45910785fb62d4abbeffff35b0b9708dd5))
+- **@cubejs-client/core:** fix HTTP poll not working if Cube API stops and recovers ([#3506](https://github.com/cube-js/cube.js/issues/3506)) Thanks [@rongfengliang](https://github.com/rongfengliang) ! ([c207c3c](https://github.com/cube-js/cube.js/commit/c207c3c9e22242e8a4c6e01a2f60d10949a75366))
 
 ### Features
 
-* graphql api variables ([#6153](https://github.com/cube-js/cube.js/issues/6153)) ([5f0f705](https://github.com/cube-js/cube.js/commit/5f0f7053022f437e61d23739b9acfb364fb06a16))
+- **@cubejs-client/core:** Accept immutable queries ([#4366](https://github.com/cube-js/cube.js/issues/4366)) Thanks [@reify-thomas-smith](https://github.com/reify-thomas-smith)! ([19b1514](https://github.com/cube-js/cube.js/commit/19b1514d75cc47e0f081dd02e8de0a34aed118bb)), closes [#4160](https://github.com/cube-js/cube.js/issues/4160)
+- **client-core:** Add HTTP status code to RequestError ([#4412](https://github.com/cube-js/cube.js/issues/4412)) ([6ec4fdf](https://github.com/cube-js/cube.js/commit/6ec4fdf6921db90bd64cb29f466fa1680f3b7eb4))
 
+## [0.29.51](https://github.com/cube-js/cube.js/compare/v0.29.50...v0.29.51) (2022-04-22)
 
+### Features
 
+- **query-language:** "startsWith", "endsWith" filters support ([#4128](https://github.com/cube-js/cube.js/issues/4128)) ([e8c72d6](https://github.com/cube-js/cube.js/commit/e8c72d630eecd930a8fd36fc52f9b594a45d59c0))
 
+## [0.29.48](https://github.com/cube-js/cube.js/compare/v0.29.47...v0.29.48) (2022-04-14)
 
-## [0.31.46](https://github.com/cube-js/cube.js/compare/v0.31.45...v0.31.46) (2023-01-18)
+### Features
 
-**Note:** Version bump only for package @cubejs-client/core
+- **query-language:** "total" flag support ([#4134](https://github.com/cube-js/cube.js/issues/4134)) ([51aef5e](https://github.com/cube-js/cube.js/commit/51aef5ede6e9b0c0e0e8749119e98102f168b8ca))
 
+## [0.29.43](https://github.com/cube-js/cube.js/compare/v0.29.42...v0.29.43) (2022-04-07)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.29.42](https://github.com/cube-js/cube.js/compare/v0.29.41...v0.29.42) (2022-04-04)
 
+### Bug Fixes
 
-## [0.31.35](https://github.com/cube-js/cube.js/compare/v0.31.34...v0.31.35) (2023-01-07)
+- **playground:** rollup designer count distinct warning ([#4309](https://github.com/cube-js/cube.js/issues/4309)) ([add2dd3](https://github.com/cube-js/cube.js/commit/add2dd3106f7fd9deb3ea88fa74467ccd1b9244f))
 
+## [0.29.33](https://github.com/cube-js/cube.js/compare/v0.29.32...v0.29.33) (2022-03-17)
 
-### Bug Fixes
+### Features
 
-* **client-core:** Added type CubesMap for cubeMap in Meta ([#5897](https://github.com/cube-js/cube.js/issues/5897)) ([92d1ccb](https://github.com/cube-js/cube.js/commit/92d1ccb9166e3a608424a1e11457f1746119e5f2))
+- **playground:** non-additive measures message ([#4236](https://github.com/cube-js/cube.js/issues/4236)) ([ae18bbc](https://github.com/cube-js/cube.js/commit/ae18bbcb9030d0eef03c74410c25902602ec6d43))
 
+## [0.29.29](https://github.com/cube-js/cube.js/compare/v0.29.28...v0.29.29) (2022-03-03)
 
+### Features
 
+- Compact JSON array based response data format support ([#4046](https://github.com/cube-js/cube.js/issues/4046)) ([e74d73c](https://github.com/cube-js/cube.js/commit/e74d73c140f56e71a24c35a5f03e9af63022bced)), closes [#1](https://github.com/cube-js/cube.js/issues/1)
 
+## [0.29.23](https://github.com/cube-js/cube.js/compare/v0.29.22...v0.29.23) (2022-01-26)
 
-## [0.31.34](https://github.com/cube-js/cube.js/compare/v0.31.33...v0.31.34) (2023-01-05)
+### Bug Fixes
+
+- **@cubejs-client/core:** restore support for Angular by removing dependency on `@cubejs-client/dx` ([#3972](https://github.com/cube-js/cube.js/issues/3972)) ([13d30dc](https://github.com/cube-js/cube.js/commit/13d30dc98a08c6ef93808adaf1be6c2aa10c664a))
+- **client-core:** apiToken nullable check ([3f93f68](https://github.com/cube-js/cube.js/commit/3f93f68170ff87a50bd6bbf768e1cd36c478c20c))
 
+## [0.29.8](https://github.com/cube-js/cube.js/compare/v0.29.7...v0.29.8) (2021-12-21)
 
 ### Bug Fixes
 
-* **client-core:** move @babel/runtime to dependencies ([#5917](https://github.com/cube-js/cube.js/issues/5917)) ([67221af](https://github.com/cube-js/cube.js/commit/67221afa040bb71381369306b3cc9b5067094589))
+- **@cubejs-client/core:** Add 'meta' field to typescript TCubeMember type [#3682](https://github.com/cube-js/cube.js/issues/3682) ([#3815](https://github.com/cube-js/cube.js/issues/3815)) Thanks @System-Glitch! ([578c0a7](https://github.com/cube-js/cube.js/commit/578c0a75ec2830f48b5d6156370f9343b2fd8b6b))
 
+## [0.29.5](https://github.com/cube-js/cube.js/compare/v0.29.4...v0.29.5) (2021-12-17)
 
+### Features
 
+- **@cubejs-client/dx:** introduce new dependency for Cube.js Client ([5bfaf1c](https://github.com/cube-js/cube.js/commit/5bfaf1cf99d68dfcdddb04f2b3151ad451657ff9))
 
+# [0.29.0](https://github.com/cube-js/cube.js/compare/v0.28.67...v0.29.0) (2021-12-14)
 
-## [0.31.33](https://github.com/cube-js/cube.js/compare/v0.31.32...v0.31.33) (2023-01-03)
+### Bug Fixes
 
+- **client-core:** nullish measure values ([#3664](https://github.com/cube-js/cube.js/issues/3664)) ([f28f803](https://github.com/cube-js/cube.js/commit/f28f803521c9020ce639f68612143c2e962975ea))
 
-### Bug Fixes
+### BREAKING CHANGES
 
-* **@cubejs-client/core:** add missing Series.shortTitle typing ([#5860](https://github.com/cube-js/cube.js/issues/5860)) ([5dd78b9](https://github.com/cube-js/cube.js/commit/5dd78b9544965304757c72d8f305741f78bfc935))
+- **client-core:** All undefined/null measure values will now be converted to 0
 
+## [0.28.52](https://github.com/cube-js/cube.js/compare/v0.28.51...v0.28.52) (2021-11-03)
 
+### Bug Fixes
 
+- **client-core:** dayjs global locale conflict ([#3606](https://github.com/cube-js/cube.js/issues/3606)) Thanks @LvtLvt! ([de7471d](https://github.com/cube-js/cube.js/commit/de7471dfecd1c49f2e9554c92307d3f7c5b8eb9a))
 
+## [0.28.45](https://github.com/cube-js/cube.js/compare/v0.28.44...v0.28.45) (2021-10-19)
 
-## [0.31.30](https://github.com/cube-js/cube.js/compare/v0.31.29...v0.31.30) (2022-12-22)
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.28.38](https://github.com/cube-js/cube.js/compare/v0.28.37...v0.28.38) (2021-09-20)
 
-### Features
+### Bug Fixes
 
-* **@cubejs-client/core:** expose shortTitle in seriesNames ([#5836](https://github.com/cube-js/cube.js/issues/5836)) Thanks [@euljr](https://github.com/euljr) ! ([1058d5a](https://github.com/cube-js/cube.js/commit/1058d5afd2784302b23215d73c679d35ceb785a8))
+- **playground:** member visibility filter ([958fad1](https://github.com/cube-js/cube.js/commit/958fad1661d75fa7f387d837c209e5494ca94af4))
 
+### Features
 
+- **playground:** time zone for cron expressions ([#3441](https://github.com/cube-js/cube.js/issues/3441)) ([b27f509](https://github.com/cube-js/cube.js/commit/b27f509c690c7970ea5443650a141a1bbfcc947b))
 
+## [0.28.37](https://github.com/cube-js/cube.js/compare/v0.28.36...v0.28.37) (2021-09-17)
 
+### Features
 
-## [0.31.15](https://github.com/cube-js/cube.js/compare/v0.31.14...v0.31.15) (2022-11-17)
+- **playground:** add rollup button ([#3424](https://github.com/cube-js/cube.js/issues/3424)) ([a5db7f1](https://github.com/cube-js/cube.js/commit/a5db7f1905d1eb50bb6e78b4c6c54e03ba7499c9))
 
+## [0.28.35](https://github.com/cube-js/cube.js/compare/v0.28.34...v0.28.35) (2021-09-13)
 
 ### Bug Fixes
 
-* packages/cubejs-client-core/package.json to reduce vulnerabilities ([#5415](https://github.com/cube-js/cube.js/issues/5415)) ([fb2de68](https://github.com/cube-js/cube.js/commit/fb2de682670bd28b2879d0460fac990d9b653dce))
+- **cubejs-client-core:** keep order of elements within tableColumns ([#3368](https://github.com/cube-js/cube.js/issues/3368)) ([b9a0f47](https://github.com/cube-js/cube.js/commit/b9a0f4744543d2d5facdbb191638f05790d21070))
 
+## [0.28.25](https://github.com/cube-js/cube.js/compare/v0.28.24...v0.28.25) (2021-08-20)
 
+### Bug Fixes
 
+- **@cubejs-client/core:** prevent redundant auth updates ([#3288](https://github.com/cube-js/cube.js/issues/3288)) ([5ebf211](https://github.com/cube-js/cube.js/commit/5ebf211fde56aeee1a59f0cabc9f7ae3f8e9ffaa))
 
+## [0.28.24](https://github.com/cube-js/cube.js/compare/v0.28.23...v0.28.24) (2021-08-19)
 
-## [0.31.13](https://github.com/cube-js/cube.js/compare/v0.31.12...v0.31.13) (2022-11-08)
+### Features
 
+- Added Quarter to the timeDimensions of ([3f62b2c](https://github.com/cube-js/cube.js/commit/3f62b2c125b2b7b752e370b65be4c89a0c65a623))
+- Support quarter granularity ([4ad1356](https://github.com/cube-js/cube.js/commit/4ad1356ac2d2c4d479c25e60519b0f7b4c1605bb))
 
-### Features
+## [0.28.17](https://github.com/cube-js/cube.js/compare/v0.28.16...v0.28.17) (2021-08-11)
+
+### Bug Fixes
 
-* notStartsWith/notEndsWith filters support ([#5579](https://github.com/cube-js/cube.js/issues/5579)) ([8765833](https://github.com/cube-js/cube.js/commit/87658333df0194db07c3ce0ae6f94a292f8bd592))
+- **@cubejs-client/core:** client hangs when loading big responses (node) ([#3216](https://github.com/cube-js/cube.js/issues/3216)) ([33a16f9](https://github.com/cube-js/cube.js/commit/33a16f983f5bbbb88e62f737ee2dc0670f3710c7))
 
+## [0.28.15](https://github.com/cube-js/cube.js/compare/v0.28.14...v0.28.15) (2021-08-06)
 
+### Bug Fixes
 
+- **@cubejs-client/core:** do not filter out time dimensions ([#3201](https://github.com/cube-js/cube.js/issues/3201)) ([0300093](https://github.com/cube-js/cube.js/commit/0300093e0af29b87e7a9018dc8159c1299e3cd85))
 
+## [0.28.10](https://github.com/cube-js/cube.js/compare/v0.28.9...v0.28.10) (2021-07-30)
 
-## [0.31.9](https://github.com/cube-js/cube.js/compare/v0.31.8...v0.31.9) (2022-11-01)
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.28.9](https://github.com/cube-js/cube.js/compare/v0.28.8...v0.28.9) (2021-07-29)
 
 ### Bug Fixes
 
-* **@cubejs-client/core:** `startsWith` and `endsWith` to filterOperatorsForMember ([#5544](https://github.com/cube-js/cube.js/issues/5544)) ([583de4a](https://github.com/cube-js/cube.js/commit/583de4a58c841542f3138c5ce836dbfedd19d4de))
-
+- **@cubejs-client/core:** data blending without date range ([#3161](https://github.com/cube-js/cube.js/issues/3161)) ([cc7c140](https://github.com/cube-js/cube.js/commit/cc7c1401b1d4e7d66fa4215997cfa4f19f8a5707))
 
+## [0.28.6](https://github.com/cube-js/cube.js/compare/v0.28.5...v0.28.6) (2021-07-22)
 
+### Features
 
+- **@cubejs-client/ngx:** async CubejsClient initialization ([#2876](https://github.com/cube-js/cube.js/issues/2876)) ([bba3a01](https://github.com/cube-js/cube.js/commit/bba3a01d2a072093509633f2d26e8df9677f940c))
 
-## [0.31.8](https://github.com/cube-js/cube.js/compare/v0.31.7...v0.31.8) (2022-10-30)
+## [0.28.1](https://github.com/cube-js/cube.js/compare/v0.28.0...v0.28.1) (2021-07-19)
 
 **Note:** Version bump only for package @cubejs-client/core
 
+# [0.28.0](https://github.com/cube-js/cube.js/compare/v0.27.53...v0.28.0) (2021-07-17)
 
+### Features
 
+- Move partition range evaluation from Schema Compiler to Query Orchestrator to allow unbounded queries on partitioned pre-aggregations ([8ea654e](https://github.com/cube-js/cube.js/commit/8ea654e93b57014fb2409e070b3a4c381985a9fd))
 
+## [0.27.51](https://github.com/cube-js/cube.js/compare/v0.27.50...v0.27.51) (2021-07-13)
 
-# [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
+### Bug Fixes
 
-**Note:** Version bump only for package @cubejs-client/core
+- **@cubejs-client/core:** incorrect types for logical and/or in query filters ([#3083](https://github.com/cube-js/cube.js/issues/3083)) ([d7014a2](https://github.com/cube-js/cube.js/commit/d7014a21add8d264d92987a3c840d98d09545457))
 
+## [0.27.48](https://github.com/cube-js/cube.js/compare/v0.27.47...v0.27.48) (2021-07-08)
 
+### Bug Fixes
 
+- **@cubejs-client/core:** Long Query 413 URL too large ([#3072](https://github.com/cube-js/cube.js/issues/3072)) ([67de4bc](https://github.com/cube-js/cube.js/commit/67de4bc3de69a4da86d4c8d241abe5d921d0e658))
+- **@cubejs-client/core:** week granularity ([#3076](https://github.com/cube-js/cube.js/issues/3076)) ([80812ea](https://github.com/cube-js/cube.js/commit/80812ea4027a929729187b096088f38829e9fa27))
 
+### Performance Improvements
 
-## [0.30.74](https://github.com/cube-js/cube.js/compare/v0.30.73...v0.30.74) (2022-09-20)
+- **@cubejs-client/core:** speed up the pivot implementaion ([#3075](https://github.com/cube-js/cube.js/issues/3075)) ([d6d7a85](https://github.com/cube-js/cube.js/commit/d6d7a858ea8e3940b034cd12ed1630c53e55ea6d))
 
-**Note:** Version bump only for package @cubejs-client/core
+## [0.27.47](https://github.com/cube-js/cube.js/compare/v0.27.46...v0.27.47) (2021-07-06)
 
+### Features
 
+- **@cubejs-client/playground:** rollup designer v2 ([#3018](https://github.com/cube-js/cube.js/issues/3018)) ([07e2427](https://github.com/cube-js/cube.js/commit/07e2427bb8050a74bae3a4d9206a7cfee6944022))
 
+## [0.27.41](https://github.com/cube-js/cube.js/compare/v0.27.40...v0.27.41) (2021-06-25)
 
+**Note:** Version bump only for package @cubejs-client/core
 
-## [0.30.64](https://github.com/cube-js/cube.js/compare/v0.30.63...v0.30.64) (2022-09-07)
+## [0.27.35](https://github.com/cube-js/cube.js/compare/v0.27.34...v0.27.35) (2021-06-18)
 
 **Note:** Version bump only for package @cubejs-client/core
 
+## [0.27.32](https://github.com/cube-js/cube.js/compare/v0.27.31...v0.27.32) (2021-06-12)
 
+### Features
 
+- **@cubejs-client/playground:** internal pre-agg warning ([#2943](https://github.com/cube-js/cube.js/issues/2943)) ([039270f](https://github.com/cube-js/cube.js/commit/039270f267774bb5a80d5434ba057164e565b08b))
 
+## [0.27.31](https://github.com/cube-js/cube.js/compare/v0.27.30...v0.27.31) (2021-06-11)
 
-## [0.30.60](https://github.com/cube-js/cube.js/compare/v0.30.59...v0.30.60) (2022-08-28)
+### Bug Fixes
 
-**Note:** Version bump only for package @cubejs-client/core
+- extDbType warning ([#2939](https://github.com/cube-js/cube.js/issues/2939)) ([0f014bf](https://github.com/cube-js/cube.js/commit/0f014bf701e07dd1d542529d4792c0e9fbdceb48))
 
+## [0.27.26](https://github.com/cube-js/cube.js/compare/v0.27.25...v0.27.26) (2021-06-01)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.27.25](https://github.com/cube-js/cube.js/compare/v0.27.24...v0.27.25) (2021-06-01)
 
+### Features
 
-## [0.30.46](https://github.com/cube-js/cube.js/compare/v0.30.45...v0.30.46) (2022-08-10)
+- time filter operators ([#2851](https://github.com/cube-js/cube.js/issues/2851)) ([5054249](https://github.com/cube-js/cube.js/commit/505424964d34ae16205485e5347409bb4c5a661d))
 
+## [0.27.24](https://github.com/cube-js/cube.js/compare/v0.27.23...v0.27.24) (2021-05-29)
 
 ### Bug Fixes
 
-* **client-core:** Fix a type inference failure ([#5067](https://github.com/cube-js/cube.js/issues/5067)) ([794708e](https://github.com/cube-js/cube.js/commit/794708e7ea3d540afdd86c58b32bab1c6a0d89c4))
+- **@cubejs-client/core:** decompose type ([#2849](https://github.com/cube-js/cube.js/issues/2849)) ([60f2596](https://github.com/cube-js/cube.js/commit/60f25964f8f7aecd8a36cc0f1b811445ae12edc6))
 
+## [0.27.22](https://github.com/cube-js/cube.js/compare/v0.27.21...v0.27.22) (2021-05-27)
 
+### Features
 
+- **@cubejs-client/vue3:** vue 3 support ([#2827](https://github.com/cube-js/cube.js/issues/2827)) ([6ac2c8c](https://github.com/cube-js/cube.js/commit/6ac2c8c938fee3001f78ef0f8782255799550514))
 
+## [0.27.19](https://github.com/cube-js/cube.js/compare/v0.27.18...v0.27.19) (2021-05-24)
 
-## [0.30.29](https://github.com/cube-js/cube.js/compare/v0.30.28...v0.30.29) (2022-07-01)
-
-**Note:** Version bump only for package @cubejs-client/core
-
+### Features
 
+- **@cubejs-client/playground:** pre-agg helper ([#2807](https://github.com/cube-js/cube.js/issues/2807)) ([44f09c3](https://github.com/cube-js/cube.js/commit/44f09c39ce3b2a8c6a2ce2fb66b75a0c288eb1da))
 
+## [0.27.17](https://github.com/cube-js/cube.js/compare/v0.27.16...v0.27.17) (2021-05-22)
 
+### Features
 
-## [0.30.4](https://github.com/cube-js/cube.js/compare/v0.30.3...v0.30.4) (2022-05-20)
+- **@cubejs-client/core:** exporting CubejsApi class ([#2773](https://github.com/cube-js/cube.js/issues/2773)) ([03cfaff](https://github.com/cube-js/cube.js/commit/03cfaff83d2ca1c9e49b6088eab3948d081bb9a9))
 
+## [0.27.15](https://github.com/cube-js/cube.js/compare/v0.27.14...v0.27.15) (2021-05-18)
 
 ### Bug Fixes
 
-* **playground:** Remove all time time dimension without granularity ([#4564](https://github.com/cube-js/cube.js/issues/4564)) ([054f488](https://github.com/cube-js/cube.js/commit/054f488ce6b8bfa103cd435f99178ca1f2fa38c7))
-
-
-
-
-
-# [0.30.0](https://github.com/cube-js/cube.js/compare/v0.29.57...v0.30.0) (2022-05-11)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
+- **@cubejs-client/core:** compareDateRange pivot fix ([#2752](https://github.com/cube-js/cube.js/issues/2752)) ([653ad84](https://github.com/cube-js/cube.js/commit/653ad84f57cc7d5e004c92fe717246ce33d7dcad))
+- **@cubejs-client/core:** Meta types fixes ([#2746](https://github.com/cube-js/cube.js/issues/2746)) ([cd17755](https://github.com/cube-js/cube.js/commit/cd17755a07fe19fbebe44d0193330d43a66b757d))
 
+### Features
 
-## [0.29.54](https://github.com/cube-js/cube.js/compare/v0.29.53...v0.29.54) (2022-05-03)
+- **@cubejs-client/playground:** member grouping ([#2736](https://github.com/cube-js/cube.js/issues/2736)) ([7659438](https://github.com/cube-js/cube.js/commit/76594383e08e44354c5966f8e60107d65e05ddab))
 
+## [0.27.14](https://github.com/cube-js/cube.js/compare/v0.27.13...v0.27.14) (2021-05-13)
 
 ### Features
 
-* Detailed client TS types ([#4446](https://github.com/cube-js/cube.js/issues/4446)) Thanks [@reify-thomas-smith](https://github.com/reify-thomas-smith) ! ([977cce0](https://github.com/cube-js/cube.js/commit/977cce0c440bc73c0e6b5ad0c10af926b7386873)), closes [#4202](https://github.com/cube-js/cube.js/issues/4202)
-
-
+- **@cubejs-client/core:** member sorting ([#2733](https://github.com/cube-js/cube.js/issues/2733)) ([fae3b29](https://github.com/cube-js/cube.js/commit/fae3b293a2ce84ea518567f38546f14acc587e0d))
 
+## [0.27.13](https://github.com/cube-js/cube.js/compare/v0.27.12...v0.27.13) (2021-05-13)
 
+### Bug Fixes
 
-## [0.29.53](https://github.com/cube-js/cube.js/compare/v0.29.52...v0.29.53) (2022-04-29)
+- **@cubejs-client/core:** response error handling ([#2703](https://github.com/cube-js/cube.js/issues/2703)) ([de31373](https://github.com/cube-js/cube.js/commit/de31373d9829a6924d7edc04b96464ffa417d920))
 
+## [0.27.6](https://github.com/cube-js/cube.js/compare/v0.27.5...v0.27.6) (2021-05-03)
 
 ### Bug Fixes
 
-* **@cubejs-client/core:** Correct LogicalAndFilter/LogicalOrFilter types: allow any filter types in and / or ([#4343](https://github.com/cube-js/cube.js/issues/4343)) Thanks [@tchell](https://github.com/tchell) ! ([699a2f4](https://github.com/cube-js/cube.js/commit/699a2f45910785fb62d4abbeffff35b0b9708dd5))
-* **@cubejs-client/core:** fix HTTP poll not working if Cube API stops and recovers ([#3506](https://github.com/cube-js/cube.js/issues/3506)) Thanks [@rongfengliang](https://github.com/rongfengliang) ! ([c207c3c](https://github.com/cube-js/cube.js/commit/c207c3c9e22242e8a4c6e01a2f60d10949a75366))
+- **@cubejs-client/playground:** display server error message ([#2648](https://github.com/cube-js/cube.js/issues/2648)) ([c4d8936](https://github.com/cube-js/cube.js/commit/c4d89369db8796fb136af8370aee2111ac3d0316))
 
+## [0.27.5](https://github.com/cube-js/cube.js/compare/v0.27.4...v0.27.5) (2021-05-03)
 
-### Features
+**Note:** Version bump only for package @cubejs-client/core
 
-* **@cubejs-client/core:** Accept immutable queries ([#4366](https://github.com/cube-js/cube.js/issues/4366)) Thanks [@reify-thomas-smith](https://github.com/reify-thomas-smith)! ([19b1514](https://github.com/cube-js/cube.js/commit/19b1514d75cc47e0f081dd02e8de0a34aed118bb)), closes [#4160](https://github.com/cube-js/cube.js/issues/4160)
-* **client-core:** Add HTTP status code to RequestError ([#4412](https://github.com/cube-js/cube.js/issues/4412)) ([6ec4fdf](https://github.com/cube-js/cube.js/commit/6ec4fdf6921db90bd64cb29f466fa1680f3b7eb4))
+# [0.27.0](https://github.com/cube-js/cube.js/compare/v0.26.104...v0.27.0) (2021-04-26)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.26.102](https://github.com/cube-js/cube.js/compare/v0.26.101...v0.26.102) (2021-04-22)
 
+### Bug Fixes
 
+- **@cubejs-client/core:** add type definition to the categories method ([#2585](https://github.com/cube-js/cube.js/issues/2585)) ([4112b2d](https://github.com/cube-js/cube.js/commit/4112b2ddf956537dd1fc3d08b249bef8d07f7645))
 
-## [0.29.51](https://github.com/cube-js/cube.js/compare/v0.29.50...v0.29.51) (2022-04-22)
+## [0.26.94](https://github.com/cube-js/cube.js/compare/v0.26.93...v0.26.94) (2021-04-13)
 
+### Bug Fixes
 
-### Features
+- **@cubejs-client/core:** WebSocket response check ([7af1b45](https://github.com/cube-js/cube.js/commit/7af1b458a9f2d7390e80805241d108b895d5c2cc))
 
-* **query-language:** "startsWith", "endsWith" filters support ([#4128](https://github.com/cube-js/cube.js/issues/4128)) ([e8c72d6](https://github.com/cube-js/cube.js/commit/e8c72d630eecd930a8fd36fc52f9b594a45d59c0))
+## [0.26.93](https://github.com/cube-js/cube.js/compare/v0.26.92...v0.26.93) (2021-04-12)
 
+### Bug Fixes
 
+- **@cubejs-client/vue:** make query reactive ([#2539](https://github.com/cube-js/cube.js/issues/2539)) ([9bce6ba](https://github.com/cube-js/cube.js/commit/9bce6ba964d71f0cba0e4d4e4e21a973309d77d4))
 
+## [0.26.90](https://github.com/cube-js/cube.js/compare/v0.26.89...v0.26.90) (2021-04-11)
 
+### Bug Fixes
 
-## [0.29.48](https://github.com/cube-js/cube.js/compare/v0.29.47...v0.29.48) (2022-04-14)
+- **@cubejs-client/core:** display request status code ([b6108c9](https://github.com/cube-js/cube.js/commit/b6108c9285ffe177439b2310c201d19f19819206))
 
+## [0.26.82](https://github.com/cube-js/cube.js/compare/v0.26.81...v0.26.82) (2021-04-07)
 
 ### Features
 
-* **query-language:** "total" flag support ([#4134](https://github.com/cube-js/cube.js/issues/4134)) ([51aef5e](https://github.com/cube-js/cube.js/commit/51aef5ede6e9b0c0e0e8749119e98102f168b8ca))
-
-
-
+- **@cubejs-client/playground:** run query button, disable query auto triggering ([#2476](https://github.com/cube-js/cube.js/issues/2476)) ([92a5d45](https://github.com/cube-js/cube.js/commit/92a5d45eca00e88e925e547a12c3f69b05bfafa6))
 
+## [0.26.73](https://github.com/cube-js/cube.js/compare/v0.26.72...v0.26.73) (2021-04-01)
 
-## [0.29.43](https://github.com/cube-js/cube.js/compare/v0.29.42...v0.29.43) (2022-04-07)
-
-**Note:** Version bump only for package @cubejs-client/core
-
+### Features
 
+- Introduce ITransportResponse for HttpTransport/WSTransport, fix [#2439](https://github.com/cube-js/cube.js/issues/2439) ([756bcb8](https://github.com/cube-js/cube.js/commit/756bcb8ae9cd6075382c01a88e46415dd7d024b3))
 
+## [0.26.70](https://github.com/cube-js/cube.js/compare/v0.26.69...v0.26.70) (2021-03-26)
 
+### Features
 
-## [0.29.42](https://github.com/cube-js/cube.js/compare/v0.29.41...v0.29.42) (2022-04-04)
+- Vue chart renderers ([#2428](https://github.com/cube-js/cube.js/issues/2428)) ([bc2cbab](https://github.com/cube-js/cube.js/commit/bc2cbab22fee860cfc846d1207f6a83899198dd8))
 
+## [0.26.69](https://github.com/cube-js/cube.js/compare/v0.26.68...v0.26.69) (2021-03-25)
 
 ### Bug Fixes
 
-* **playground:** rollup designer count distinct warning ([#4309](https://github.com/cube-js/cube.js/issues/4309)) ([add2dd3](https://github.com/cube-js/cube.js/commit/add2dd3106f7fd9deb3ea88fa74467ccd1b9244f))
-
-
+- **@cubejs-client/core:** Updated totalRow within ResultSet ([#2410](https://github.com/cube-js/cube.js/issues/2410)) ([91e51be](https://github.com/cube-js/cube.js/commit/91e51be6e5690dfe6ba294f75e768406fcc9d4a1))
 
+## [0.26.63](https://github.com/cube-js/cube.js/compare/v0.26.62...v0.26.63) (2021-03-22)
 
+### Bug Fixes
 
-## [0.29.33](https://github.com/cube-js/cube.js/compare/v0.29.32...v0.29.33) (2022-03-17)
+- **@cubejs-client/ngx:** wrong type reference ([#2407](https://github.com/cube-js/cube.js/issues/2407)) ([d6c4183](https://github.com/cube-js/cube.js/commit/d6c41838df53d18eae23b2d38f86435626568ccf))
 
+## [0.26.61](https://github.com/cube-js/cube.js/compare/v0.26.60...v0.26.61) (2021-03-18)
 
 ### Features
 
-* **playground:** non-additive measures message ([#4236](https://github.com/cube-js/cube.js/issues/4236)) ([ae18bbc](https://github.com/cube-js/cube.js/commit/ae18bbcb9030d0eef03c74410c25902602ec6d43))
+- **@cubejs-client/vue:** vue query builder ([#1824](https://github.com/cube-js/cube.js/issues/1824)) ([06ee13f](https://github.com/cube-js/cube.js/commit/06ee13f72ef33372385567ed5e1795087b4f5f53))
 
+## [0.26.60](https://github.com/cube-js/cube.js/compare/v0.26.59...v0.26.60) (2021-03-16)
 
+### Features
 
+- **@cubejs-client/playground:** Playground components ([#2329](https://github.com/cube-js/cube.js/issues/2329)) ([489dc12](https://github.com/cube-js/cube.js/commit/489dc12d7e9bfa87bfb3c8ffabf76f238c86a2fe))
 
+## [0.26.55](https://github.com/cube-js/cube.js/compare/v0.26.54...v0.26.55) (2021-03-12)
 
-## [0.29.29](https://github.com/cube-js/cube.js/compare/v0.29.28...v0.29.29) (2022-03-03)
+### Bug Fixes
 
+- **playground:** Cannot read property 'extendMoment' of undefined ([42fd694](https://github.com/cube-js/cube.js/commit/42fd694f28782413c25356530d6b07db9ea091e0))
 
-### Features
+## [0.26.54](https://github.com/cube-js/cube.js/compare/v0.26.53...v0.26.54) (2021-03-12)
 
-* Compact JSON array based response data format support ([#4046](https://github.com/cube-js/cube.js/issues/4046)) ([e74d73c](https://github.com/cube-js/cube.js/commit/e74d73c140f56e71a24c35a5f03e9af63022bced)), closes [#1](https://github.com/cube-js/cube.js/issues/1)
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.26.53](https://github.com/cube-js/cube.js/compare/v0.26.52...v0.26.53) (2021-03-11)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.26.45](https://github.com/cube-js/cube.js/compare/v0.26.44...v0.26.45) (2021-03-04)
 
+### Bug Fixes
 
-## [0.29.23](https://github.com/cube-js/cube.js/compare/v0.29.22...v0.29.23) (2022-01-26)
+- **@cubejs-client:** react, core TypeScript fixes ([#2261](https://github.com/cube-js/cube.js/issues/2261)). Thanks to @SteffeyDev! ([4db93af](https://github.com/cube-js/cube.js/commit/4db93af984e737d7a6a448facbc8227907007c5d))
 
+## [0.26.19](https://github.com/cube-js/cube.js/compare/v0.26.18...v0.26.19) (2021-02-19)
 
 ### Bug Fixes
 
-* **@cubejs-client/core:** restore support for Angular by removing dependency on `@cubejs-client/dx` ([#3972](https://github.com/cube-js/cube.js/issues/3972)) ([13d30dc](https://github.com/cube-js/cube.js/commit/13d30dc98a08c6ef93808adaf1be6c2aa10c664a))
-* **client-core:** apiToken nullable check ([3f93f68](https://github.com/cube-js/cube.js/commit/3f93f68170ff87a50bd6bbf768e1cd36c478c20c))
+- **@cubejs-client/core:** manage boolean filters for missing members ([#2139](https://github.com/cube-js/cube.js/issues/2139)) ([6fad355](https://github.com/cube-js/cube.js/commit/6fad355ea47c0e9dda1e733345a0de0a0d99e7cb))
+- **@cubejs-client/react:** type fixes ([#2140](https://github.com/cube-js/cube.js/issues/2140)) ([bca1ff7](https://github.com/cube-js/cube.js/commit/bca1ff72b0204a3cce1d4ee658396b3e22adb1cd))
 
+## [0.26.13](https://github.com/cube-js/cube.js/compare/v0.26.12...v0.26.13) (2021-02-12)
 
+### Features
 
+- **@cubejs-client/playground:** handle missing members ([#2067](https://github.com/cube-js/cube.js/issues/2067)) ([348b245](https://github.com/cube-js/cube.js/commit/348b245f4086095fbe1515d7821d631047f0008c))
 
+# [0.26.0](https://github.com/cube-js/cube.js/compare/v0.25.33...v0.26.0) (2021-02-01)
 
-## [0.29.8](https://github.com/cube-js/cube.js/compare/v0.29.7...v0.29.8) (2021-12-21)
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.25.31](https://github.com/cube-js/cube.js/compare/v0.25.30...v0.25.31) (2021-01-28)
 
 ### Bug Fixes
 
-* **@cubejs-client/core:** Add 'meta' field to typescript TCubeMember type [#3682](https://github.com/cube-js/cube.js/issues/3682) ([#3815](https://github.com/cube-js/cube.js/issues/3815)) Thanks @System-Glitch! ([578c0a7](https://github.com/cube-js/cube.js/commit/578c0a75ec2830f48b5d6156370f9343b2fd8b6b))
-
+- **@cubejs-client/core:** propagate time dimension to the drill down query ([#1911](https://github.com/cube-js/cube.js/issues/1911)) ([59701da](https://github.com/cube-js/cube.js/commit/59701dad6f6cb6d78954d18b309716a9d51aa6b7))
 
+# [0.25.0](https://github.com/cube-js/cube.js/compare/v0.24.15...v0.25.0) (2020-12-21)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.24.14](https://github.com/cube-js/cube.js/compare/v0.24.13...v0.24.14) (2020-12-19)
 
-## [0.29.5](https://github.com/cube-js/cube.js/compare/v0.29.4...v0.29.5) (2021-12-17)
+### Features
 
+- Add HTTP Post to cubejs client core ([#1608](https://github.com/cube-js/cube.js/issues/1608)). Thanks to [@mnifakram](https://github.com/mnifakram)! ([1ebd6a0](https://github.com/cube-js/cube.js/commit/1ebd6a04ac97b31c6a51ef63bb1d4c040e524190))
 
-### Features
+## [0.24.13](https://github.com/cube-js/cube.js/compare/v0.24.12...v0.24.13) (2020-12-18)
 
-* **@cubejs-client/dx:** introduce new dependency for Cube.js Client ([5bfaf1c](https://github.com/cube-js/cube.js/commit/5bfaf1cf99d68dfcdddb04f2b3151ad451657ff9))
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.24.12](https://github.com/cube-js/cube.js/compare/v0.24.11...v0.24.12) (2020-12-17)
 
+### Bug Fixes
 
+- **@cubejs-core:** Add type definition for compareDateRange, fix [#1621](https://github.com/cube-js/cube.js/issues/1621) ([#1623](https://github.com/cube-js/cube.js/issues/1623)). Thanks to [@cbroome](https://github.com/cbroome)! ([d8b7f36](https://github.com/cube-js/cube.js/commit/d8b7f3654c705cc020ccfa548b180b56b5422f60))
 
+## [0.24.9](https://github.com/cube-js/cube.js/compare/v0.24.8...v0.24.9) (2020-12-16)
 
-# [0.29.0](https://github.com/cube-js/cube.js/compare/v0.28.67...v0.29.0) (2021-12-14)
+### Features
 
+- **@cubejs-client/playground:** Angular chart code generation support in Playground ([#1519](https://github.com/cube-js/cube.js/issues/1519)) ([4690e11](https://github.com/cube-js/cube.js/commit/4690e11f417ff65fea8426360f3f5a2b3acd2792)), closes [#1515](https://github.com/cube-js/cube.js/issues/1515) [#1612](https://github.com/cube-js/cube.js/issues/1612)
 
-### Bug Fixes
+## [0.24.8](https://github.com/cube-js/cube.js/compare/v0.24.7...v0.24.8) (2020-12-15)
 
-* **client-core:** nullish measure values ([#3664](https://github.com/cube-js/cube.js/issues/3664)) ([f28f803](https://github.com/cube-js/cube.js/commit/f28f803521c9020ce639f68612143c2e962975ea))
+### Features
 
+- **@cubejs-client/core:** Added pivotConfig option to alias series with a prefix ([#1594](https://github.com/cube-js/cube.js/issues/1594)). Thanks to @MattGson! ([a3342f7](https://github.com/cube-js/cube.js/commit/a3342f7fd0389ce3ad0bc62686c0e787de25f411))
 
-### BREAKING CHANGES
+## [0.24.4](https://github.com/cube-js/cube.js/compare/v0.24.3...v0.24.4) (2020-12-07)
 
-* **client-core:** All undefined/null measure values will now be converted to 0
+**Note:** Version bump only for package @cubejs-client/core
 
+# [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.23.14](https://github.com/cube-js/cube.js/compare/v0.23.13...v0.23.14) (2020-11-22)
 
+### Bug Fixes
 
-## [0.28.52](https://github.com/cube-js/cube.js/compare/v0.28.51...v0.28.52) (2021-11-03)
+- **@cubejs-client/core:** propagate segments to drillDown queries ([#1406](https://github.com/cube-js/cube.js/issues/1406)) ([d4ceb65](https://github.com/cube-js/cube.js/commit/d4ceb6502db9c62c0cf95f1e48879f95ea4544d7))
 
+## [0.23.12](https://github.com/cube-js/cube.js/compare/v0.23.11...v0.23.12) (2020-11-17)
 
 ### Bug Fixes
 
-* **client-core:** dayjs global locale conflict ([#3606](https://github.com/cube-js/cube.js/issues/3606)) Thanks @LvtLvt! ([de7471d](https://github.com/cube-js/cube.js/commit/de7471dfecd1c49f2e9554c92307d3f7c5b8eb9a))
-
+- **@cubejs-client/core:** pivot should work well with null values ([#1386](https://github.com/cube-js/cube.js/issues/1386)). Thanks to [@mspiegel31](https://github.com/mspiegel31)! ([d4c2446](https://github.com/cube-js/cube.js/commit/d4c24469b8eea2d84f04c540b0a5f9a8d285ad1d))
 
+## [0.23.11](https://github.com/cube-js/cube.js/compare/v0.23.10...v0.23.11) (2020-11-13)
 
+### Bug Fixes
 
+- **@cubejs-client/core:** annotation format type ([e5004f6](https://github.com/cube-js/cube.js/commit/e5004f6bf687e7df4b611bf1d772da278558759d))
+- **@cubejs-playground:** boolean filters support ([#1269](https://github.com/cube-js/cube.js/issues/1269)) ([adda809](https://github.com/cube-js/cube.js/commit/adda809e4cd08436ffdf8f3396a6f35725f3dc22))
 
-## [0.28.45](https://github.com/cube-js/cube.js/compare/v0.28.44...v0.28.45) (2021-10-19)
+## [0.23.6](https://github.com/cube-js/cube.js/compare/v0.23.5...v0.23.6) (2020-11-02)
 
 **Note:** Version bump only for package @cubejs-client/core
 
+# [0.23.0](https://github.com/cube-js/cube.js/compare/v0.22.4...v0.23.0) (2020-10-28)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.22.2](https://github.com/cube-js/cube.js/compare/v0.22.1...v0.22.2) (2020-10-26)
 
+### Bug Fixes
 
-## [0.28.38](https://github.com/cube-js/cube.js/compare/v0.28.37...v0.28.38) (2021-09-20)
+- **@cubejs-client/core:** duplicate names in ResultSet.seriesNames() ([#1187](https://github.com/cube-js/cube.js/issues/1187)). Thanks to [@aviranmoz](https://github.com/aviranmoz)! ([8d9eb68](https://github.com/cube-js/cube.js/commit/8d9eb68))
 
+## [0.22.1](https://github.com/cube-js/cube.js/compare/v0.22.0...v0.22.1) (2020-10-21)
 
 ### Bug Fixes
 
-* **playground:** member visibility filter ([958fad1](https://github.com/cube-js/cube.js/commit/958fad1661d75fa7f387d837c209e5494ca94af4))
-
+- **@cubejs-playground:** avoid unnecessary load calls, dryRun ([#1210](https://github.com/cube-js/cube.js/issues/1210)) ([aaf4911](https://github.com/cube-js/cube.js/commit/aaf4911))
 
-### Features
+# [0.22.0](https://github.com/cube-js/cube.js/compare/v0.21.2...v0.22.0) (2020-10-20)
 
-* **playground:** time zone for cron expressions ([#3441](https://github.com/cube-js/cube.js/issues/3441)) ([b27f509](https://github.com/cube-js/cube.js/commit/b27f509c690c7970ea5443650a141a1bbfcc947b))
+### Bug Fixes
 
+- umd build default export ([#1219](https://github.com/cube-js/cube.js/issues/1219)) ([cc434eb](https://github.com/cube-js/cube.js/commit/cc434eb))
+- **@cubejs-client/core:** Add parseDateMeasures field to CubeJSApiOptions (typings) ([e1a1ada](https://github.com/cube-js/cube.js/commit/e1a1ada))
 
+## [0.21.1](https://github.com/cube-js/cube.js/compare/v0.21.0...v0.21.1) (2020-10-15)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+# [0.21.0](https://github.com/cube-js/cube.js/compare/v0.20.15...v0.21.0) (2020-10-09)
 
-## [0.28.37](https://github.com/cube-js/cube.js/compare/v0.28.36...v0.28.37) (2021-09-17)
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.20.12](https://github.com/cube-js/cube.js/compare/v0.20.11...v0.20.12) (2020-10-02)
 
 ### Features
 
-* **playground:** add rollup button ([#3424](https://github.com/cube-js/cube.js/issues/3424)) ([a5db7f1](https://github.com/cube-js/cube.js/commit/a5db7f1905d1eb50bb6e78b4c6c54e03ba7499c9))
-
-
+- angular query builder ([#1073](https://github.com/cube-js/cube.js/issues/1073)) ([ea088b3](https://github.com/cube-js/cube.js/commit/ea088b3))
 
+## [0.20.11](https://github.com/cube-js/cube.js/compare/v0.20.10...v0.20.11) (2020-09-28)
 
+### Bug Fixes
 
-## [0.28.35](https://github.com/cube-js/cube.js/compare/v0.28.34...v0.28.35) (2021-09-13)
+- propagate drill down parent filters ([#1143](https://github.com/cube-js/cube.js/issues/1143)) ([314985e](https://github.com/cube-js/cube.js/commit/314985e))
 
+## [0.20.10](https://github.com/cube-js/cube.js/compare/v0.20.9...v0.20.10) (2020-09-23)
 
 ### Bug Fixes
 
-* **cubejs-client-core:** keep order of elements within tableColumns ([#3368](https://github.com/cube-js/cube.js/issues/3368)) ([b9a0f47](https://github.com/cube-js/cube.js/commit/b9a0f4744543d2d5facdbb191638f05790d21070))
-
+- drilling into any measure other than the first ([#1131](https://github.com/cube-js/cube.js/issues/1131)) ([e741a20](https://github.com/cube-js/cube.js/commit/e741a20))
 
+## [0.20.9](https://github.com/cube-js/cube.js/compare/v0.20.8...v0.20.9) (2020-09-19)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.20.6](https://github.com/cube-js/cube.js/compare/v0.20.5...v0.20.6) (2020-09-10)
 
-## [0.28.25](https://github.com/cube-js/cube.js/compare/v0.28.24...v0.28.25) (2021-08-20)
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.20.5](https://github.com/cube-js/cube.js/compare/v0.20.4...v0.20.5) (2020-09-10)
 
 ### Bug Fixes
 
-* **@cubejs-client/core:** prevent redundant auth updates ([#3288](https://github.com/cube-js/cube.js/issues/3288)) ([5ebf211](https://github.com/cube-js/cube.js/commit/5ebf211fde56aeee1a59f0cabc9f7ae3f8e9ffaa))
+- cube-client-core resolveMember return type ([#1051](https://github.com/cube-js/cube.js/issues/1051)). Thanks to @Aaronkala ([662cfe0](https://github.com/cube-js/cube.js/commit/662cfe0))
+- improve TimeDimensionGranularity type ([#1052](https://github.com/cube-js/cube.js/issues/1052)). Thanks to [@joealden](https://github.com/joealden) ([1e9bd99](https://github.com/cube-js/cube.js/commit/1e9bd99))
 
+## [0.20.3](https://github.com/cube-js/cube.js/compare/v0.20.2...v0.20.3) (2020-09-03)
 
+### Bug Fixes
 
+- Export the TimeDimensionGranularity type ([#1044](https://github.com/cube-js/cube.js/issues/1044)). Thanks to [@gudjonragnar](https://github.com/gudjonragnar) ([26b329e](https://github.com/cube-js/cube.js/commit/26b329e))
 
+## [0.20.2](https://github.com/cube-js/cube.js/compare/v0.20.1...v0.20.2) (2020-09-02)
 
-## [0.28.24](https://github.com/cube-js/cube.js/compare/v0.28.23...v0.28.24) (2021-08-19)
+### Bug Fixes
 
+- subscribe option, new query types to work with ws ([dbf602e](https://github.com/cube-js/cube.js/commit/dbf602e))
 
 ### Features
 
-* Added Quarter to the timeDimensions of ([3f62b2c](https://github.com/cube-js/cube.js/commit/3f62b2c125b2b7b752e370b65be4c89a0c65a623))
-* Support quarter granularity ([4ad1356](https://github.com/cube-js/cube.js/commit/4ad1356ac2d2c4d479c25e60519b0f7b4c1605bb))
+- custom date range ([#1027](https://github.com/cube-js/cube.js/issues/1027)) ([304985f](https://github.com/cube-js/cube.js/commit/304985f))
+
+## [0.20.1](https://github.com/cube-js/cube.js/compare/v0.20.0...v0.20.1) (2020-09-01)
+
+**Note:** Version bump only for package @cubejs-client/core
 
+# [0.20.0](https://github.com/cube-js/cube.js/compare/v0.19.61...v0.20.0) (2020-08-26)
 
+### Bug Fixes
 
+- respect timezone in drillDown queries ([#1003](https://github.com/cube-js/cube.js/issues/1003)) ([c128417](https://github.com/cube-js/cube.js/commit/c128417))
 
+### Features
 
-## [0.28.17](https://github.com/cube-js/cube.js/compare/v0.28.16...v0.28.17) (2021-08-11)
+- Data blending ([#1012](https://github.com/cube-js/cube.js/issues/1012)) ([19fd00e](https://github.com/cube-js/cube.js/commit/19fd00e))
+- date range comparison support ([#979](https://github.com/cube-js/cube.js/issues/979)) ([ca21cfd](https://github.com/cube-js/cube.js/commit/ca21cfd))
+- Make the Filter type more specific. ([#915](https://github.com/cube-js/cube.js/issues/915)) Thanks to [@ylixir](https://github.com/ylixir) ([cecdb36](https://github.com/cube-js/cube.js/commit/cecdb36))
 
+## [0.19.56](https://github.com/cube-js/cube.js/compare/v0.19.55...v0.19.56) (2020-08-03)
 
 ### Bug Fixes
 
-* **@cubejs-client/core:** client hangs when loading big responses (node) ([#3216](https://github.com/cube-js/cube.js/issues/3216)) ([33a16f9](https://github.com/cube-js/cube.js/commit/33a16f983f5bbbb88e62f737ee2dc0670f3710c7))
+- membersForQuery return type ([#909](https://github.com/cube-js/cube.js/issues/909)) ([4976fcf](https://github.com/cube-js/cube.js/commit/4976fcf))
 
+## [0.19.55](https://github.com/cube-js/cube.js/compare/v0.19.54...v0.19.55) (2020-07-23)
 
+### Features
 
+- expose loadResponse annotation ([#894](https://github.com/cube-js/cube.js/issues/894)) ([2875d47](https://github.com/cube-js/cube.js/commit/2875d47))
 
+## [0.19.54](https://github.com/cube-js/cube.js/compare/v0.19.53...v0.19.54) (2020-07-23)
 
-## [0.28.15](https://github.com/cube-js/cube.js/compare/v0.28.14...v0.28.15) (2021-08-06)
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.19.53](https://github.com/cube-js/cube.js/compare/v0.19.52...v0.19.53) (2020-07-20)
 
 ### Bug Fixes
 
-* **@cubejs-client/core:** do not filter out time dimensions ([#3201](https://github.com/cube-js/cube.js/issues/3201)) ([0300093](https://github.com/cube-js/cube.js/commit/0300093e0af29b87e7a9018dc8159c1299e3cd85))
+- preserve order of sorted data ([#870](https://github.com/cube-js/cube.js/issues/870)) ([861db10](https://github.com/cube-js/cube.js/commit/861db10))
 
+## [0.19.51](https://github.com/cube-js/cube.js/compare/v0.19.50...v0.19.51) (2020-07-17)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.19.50](https://github.com/cube-js/cube.js/compare/v0.19.49...v0.19.50) (2020-07-16)
 
+### Features
 
-## [0.28.10](https://github.com/cube-js/cube.js/compare/v0.28.9...v0.28.10) (2021-07-30)
+- ResultSet serializaion and deserializaion ([#836](https://github.com/cube-js/cube.js/issues/836)) ([80b8d41](https://github.com/cube-js/cube.js/commit/80b8d41))
 
-**Note:** Version bump only for package @cubejs-client/core
+## [0.19.48](https://github.com/cube-js/cube.js/compare/v0.19.47...v0.19.48) (2020-07-11)
 
+### Bug Fixes
 
+- **cubejs-client-core:** enums exported from declaration files are not accessible ([#810](https://github.com/cube-js/cube.js/issues/810)) ([3396fbe](https://github.com/cube-js/cube.js/commit/3396fbe))
 
+## [0.19.43](https://github.com/cube-js/cube.js/compare/v0.19.42...v0.19.43) (2020-07-04)
 
+### Bug Fixes
 
-## [0.28.9](https://github.com/cube-js/cube.js/compare/v0.28.8...v0.28.9) (2021-07-29)
+- **cubejs-client-core:** Display the measure value when the y axis is empty ([#789](https://github.com/cube-js/cube.js/issues/789)) ([7ec6ac6](https://github.com/cube-js/cube.js/commit/7ec6ac6))
 
+### Features
 
-### Bug Fixes
+- Adjust client options to send credentials when needed ([#790](https://github.com/cube-js/cube.js/issues/790)) Thanks to [@colefichter](https://github.com/colefichter) ! ([5203f6c](https://github.com/cube-js/cube.js/commit/5203f6c)), closes [#788](https://github.com/cube-js/cube.js/issues/788)
 
-* **@cubejs-client/core:** data blending without date range ([#3161](https://github.com/cube-js/cube.js/issues/3161)) ([cc7c140](https://github.com/cube-js/cube.js/commit/cc7c1401b1d4e7d66fa4215997cfa4f19f8a5707))
+## [0.19.42](https://github.com/cube-js/cube.js/compare/v0.19.41...v0.19.42) (2020-07-01)
 
+### Bug Fixes
 
+- **docs-gen:** generation fixes ([1598a9b](https://github.com/cube-js/cube.js/commit/1598a9b))
+- **docs-gen:** titles ([12a1a5f](https://github.com/cube-js/cube.js/commit/12a1a5f))
 
+## [0.19.41](https://github.com/cube-js/cube.js/compare/v0.19.40...v0.19.41) (2020-06-30)
 
+### Bug Fixes
 
-## [0.28.6](https://github.com/cube-js/cube.js/compare/v0.28.5...v0.28.6) (2021-07-22)
+- **docs-gen:** generator fixes, docs updates ([c5b26d0](https://github.com/cube-js/cube.js/commit/c5b26d0))
 
+## [0.19.40](https://github.com/cube-js/cube.js/compare/v0.19.39...v0.19.40) (2020-06-30)
 
 ### Features
 
-* **@cubejs-client/ngx:** async CubejsClient initialization ([#2876](https://github.com/cube-js/cube.js/issues/2876)) ([bba3a01](https://github.com/cube-js/cube.js/commit/bba3a01d2a072093509633f2d26e8df9677f940c))
-
+- **docs-gen:** Typedoc generator ([#769](https://github.com/cube-js/cube.js/issues/769)) ([15373eb](https://github.com/cube-js/cube.js/commit/15373eb))
 
+## [0.19.37](https://github.com/cube-js/cube.js/compare/v0.19.36...v0.19.37) (2020-06-26)
 
+### Bug Fixes
 
+- **cubejs-client-core:** tableColumns empty data fix ([#750](https://github.com/cube-js/cube.js/issues/750)) ([0ac9b7a](https://github.com/cube-js/cube.js/commit/0ac9b7a))
 
-## [0.28.1](https://github.com/cube-js/cube.js/compare/v0.28.0...v0.28.1) (2021-07-19)
+### Features
 
-**Note:** Version bump only for package @cubejs-client/core
+- query builder pivot config support ([#742](https://github.com/cube-js/cube.js/issues/742)) ([4e29057](https://github.com/cube-js/cube.js/commit/4e29057))
 
+## [0.19.35](https://github.com/cube-js/cube.js/compare/v0.19.34...v0.19.35) (2020-06-22)
 
+### Bug Fixes
 
+- **cubejs-client-core:** table pivot ([#672](https://github.com/cube-js/cube.js/issues/672)) ([70015f5](https://github.com/cube-js/cube.js/commit/70015f5))
+- table ([#740](https://github.com/cube-js/cube.js/issues/740)) ([6f1a8e7](https://github.com/cube-js/cube.js/commit/6f1a8e7))
 
+## [0.19.31](https://github.com/cube-js/cube.js/compare/v0.19.30...v0.19.31) (2020-06-10)
 
-# [0.28.0](https://github.com/cube-js/cube.js/compare/v0.27.53...v0.28.0) (2021-07-17)
+### Bug Fixes
 
+- **cubejs-client-core:** Remove Content-Type header from requests in HttpTransport ([#709](https://github.com/cube-js/cube.js/issues/709)) ([f6e366c](https://github.com/cube-js/cube.js/commit/f6e366c))
 
 ### Features
 
-* Move partition range evaluation from Schema Compiler to Query Orchestrator to allow unbounded queries on partitioned pre-aggregations ([8ea654e](https://github.com/cube-js/cube.js/commit/8ea654e93b57014fb2409e070b3a4c381985a9fd))
+- Query builder order by ([#685](https://github.com/cube-js/cube.js/issues/685)) ([d3c735b](https://github.com/cube-js/cube.js/commit/d3c735b))
 
+## [0.19.23](https://github.com/cube-js/cube.js/compare/v0.19.22...v0.19.23) (2020-06-02)
 
+### Features
 
+- drill down queries support ([#664](https://github.com/cube-js/cube.js/issues/664)) ([7e21545](https://github.com/cube-js/cube.js/commit/7e21545)), closes [#190](https://github.com/cube-js/cube.js/issues/190)
 
+## [0.19.22](https://github.com/cube-js/cube.js/compare/v0.19.21...v0.19.22) (2020-05-26)
 
-## [0.27.51](https://github.com/cube-js/cube.js/compare/v0.27.50...v0.27.51) (2021-07-13)
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.19.19](https://github.com/cube-js/cube.js/compare/v0.19.18...v0.19.19) (2020-05-15)
 
 ### Bug Fixes
 
-* **@cubejs-client/core:** incorrect types for logical and/or in query filters ([#3083](https://github.com/cube-js/cube.js/issues/3083)) ([d7014a2](https://github.com/cube-js/cube.js/commit/d7014a21add8d264d92987a3c840d98d09545457))
-
+- corejs version ([8bef3b2](https://github.com/cube-js/cube.js/commit/8bef3b2))
 
+### Features
 
+- ability to add custom meta data for measures, dimensions and segments ([#641](https://github.com/cube-js/cube.js/issues/641)) ([88d5c9b](https://github.com/cube-js/cube.js/commit/88d5c9b)), closes [#625](https://github.com/cube-js/cube.js/issues/625)
 
+## [0.19.16](https://github.com/cube-js/cube.js/compare/v0.19.15...v0.19.16) (2020-05-07)
 
-## [0.27.48](https://github.com/cube-js/cube.js/compare/v0.27.47...v0.27.48) (2021-07-08)
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.19.14](https://github.com/cube-js/cube.js/compare/v0.19.13...v0.19.14) (2020-04-24)
 
-### Bug Fixes
+**Note:** Version bump only for package @cubejs-client/core
 
-* **@cubejs-client/core:** Long Query 413 URL too large ([#3072](https://github.com/cube-js/cube.js/issues/3072)) ([67de4bc](https://github.com/cube-js/cube.js/commit/67de4bc3de69a4da86d4c8d241abe5d921d0e658))
-* **@cubejs-client/core:** week granularity ([#3076](https://github.com/cube-js/cube.js/issues/3076)) ([80812ea](https://github.com/cube-js/cube.js/commit/80812ea4027a929729187b096088f38829e9fa27))
+## [0.19.13](https://github.com/cube-js/cube.js/compare/v0.19.12...v0.19.13) (2020-04-21)
 
+### Features
 
-### Performance Improvements
+- **react:** `resetResultSetOnChange` option for `QueryRenderer` and `useCubeQuery` ([c8c74d3](https://github.com/cube-js/cube.js/commit/c8c74d3))
 
-* **@cubejs-client/core:** speed up the pivot implementaion ([#3075](https://github.com/cube-js/cube.js/issues/3075)) ([d6d7a85](https://github.com/cube-js/cube.js/commit/d6d7a858ea8e3940b034cd12ed1630c53e55ea6d))
+## [0.19.12](https://github.com/cube-js/cube.js/compare/v0.19.11...v0.19.12) (2020-04-20)
 
+### Bug Fixes
 
+- Make date measure parsing optional ([d199cd5](https://github.com/cube-js/cube.js/commit/d199cd5)), closes [#602](https://github.com/cube-js/cube.js/issues/602)
 
+## [0.19.9](https://github.com/cube-js/cube.js/compare/v0.19.8...v0.19.9) (2020-04-16)
 
+### Features
 
-## [0.27.47](https://github.com/cube-js/cube.js/compare/v0.27.46...v0.27.47) (2021-07-06)
+- Parse dates on client side ([#522](https://github.com/cube-js/cube.js/issues/522)) Thanks to [@richipargo](https://github.com/richipargo)! ([11c1106](https://github.com/cube-js/cube.js/commit/11c1106))
 
+## [0.19.7](https://github.com/cube-js/cube.js/compare/v0.19.6...v0.19.7) (2020-04-14)
 
 ### Features
 
-* **@cubejs-client/playground:** rollup designer v2 ([#3018](https://github.com/cube-js/cube.js/issues/3018)) ([07e2427](https://github.com/cube-js/cube.js/commit/07e2427bb8050a74bae3a4d9206a7cfee6944022))
+- Including format and type in tableColumns ([#587](https://github.com/cube-js/cube.js/issues/587)) Thanks to [@danpanaite](https://github.com/danpanaite)! ([3f7d74f](https://github.com/cube-js/cube.js/commit/3f7d74f)), closes [#585](https://github.com/cube-js/cube.js/issues/585)
 
+# [0.19.0](https://github.com/cube-js/cube.js/compare/v0.18.32...v0.19.0) (2020-04-09)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.18.18](https://github.com/cube-js/cube.js/compare/v0.18.17...v0.18.18) (2020-03-28)
 
+**Note:** Version bump only for package @cubejs-client/core
 
-## [0.27.41](https://github.com/cube-js/cube.js/compare/v0.27.40...v0.27.41) (2021-06-25)
+## [0.18.7](https://github.com/cube-js/cube.js/compare/v0.18.6...v0.18.7) (2020-03-17)
 
 **Note:** Version bump only for package @cubejs-client/core
 
+## [0.18.5](https://github.com/cube-js/cube.js/compare/v0.18.4...v0.18.5) (2020-03-15)
 
+### Bug Fixes
 
+- **@cubejs-client/core:** make `progressCallback` optional ([#497](https://github.com/cube-js/cube.js/issues/497)) Thanks to [@hassankhan](https://github.com/hassankhan)! ([a41cf9a](https://github.com/cube-js/cube.js/commit/a41cf9a))
 
+## [0.18.4](https://github.com/cube-js/cube.js/compare/v0.18.3...v0.18.4) (2020-03-09)
 
-## [0.27.35](https://github.com/cube-js/cube.js/compare/v0.27.34...v0.27.35) (2021-06-18)
+### Bug Fixes
 
-**Note:** Version bump only for package @cubejs-client/core
+- Request span for WebSocketTransport is incorrectly set ([54ba5da](https://github.com/cube-js/cube.js/commit/54ba5da))
 
+# [0.18.0](https://github.com/cube-js/cube.js/compare/v0.17.10...v0.18.0) (2020-03-01)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+## [0.17.10](https://github.com/cube-js/cube.js/compare/v0.17.9...v0.17.10) (2020-02-20)
 
+### Bug Fixes
 
-## [0.27.32](https://github.com/cube-js/cube.js/compare/v0.27.31...v0.27.32) (2021-06-12)
+- Revert "feat: Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378))" ([b21cbe6](https://github.com/cube-js/cube.js/commit/b21cbe6)), closes [#418](https://github.com/cube-js/cube.js/issues/418)
 
+## [0.17.9](https://github.com/cube-js/cube.js/compare/v0.17.8...v0.17.9) (2020-02-18)
 
 ### Features
 
-* **@cubejs-client/playground:** internal pre-agg warning ([#2943](https://github.com/cube-js/cube.js/issues/2943)) ([039270f](https://github.com/cube-js/cube.js/commit/039270f267774bb5a80d5434ba057164e565b08b))
+- Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378)) ([cb8d51c](https://github.com/cube-js/cube.js/commit/cb8d51c))
+- Request id trace span ([880f65e](https://github.com/cube-js/cube.js/commit/880f65e))
 
+## [0.17.8](https://github.com/cube-js/cube.js/compare/v0.17.7...v0.17.8) (2020-02-14)
 
+### Bug Fixes
 
+- **@cubejs-client/core:** improve types ([#376](https://github.com/cube-js/cube.js/issues/376)) Thanks to [@hassankhan](https://github.com/hassankhan)! ([cfb65a2](https://github.com/cube-js/cube.js/commit/cfb65a2))
 
+# [0.17.0](https://github.com/cube-js/cube.js/compare/v0.16.0...v0.17.0) (2020-02-04)
 
-## [0.27.31](https://github.com/cube-js/cube.js/compare/v0.27.30...v0.27.31) (2021-06-11)
+**Note:** Version bump only for package @cubejs-client/core
 
+# [0.16.0](https://github.com/cube-js/cube.js/compare/v0.15.4...v0.16.0) (2020-02-04)
 
 ### Bug Fixes
 
-* extDbType warning ([#2939](https://github.com/cube-js/cube.js/issues/2939)) ([0f014bf](https://github.com/cube-js/cube.js/commit/0f014bf701e07dd1d542529d4792c0e9fbdceb48))
+- Do not pad `last 24 hours` interval to day ([6554611](https://github.com/cube-js/cube.js/commit/6554611)), closes [#361](https://github.com/cube-js/cube.js/issues/361)
 
+## [0.15.4](https://github.com/cube-js/cube.js/compare/v0.15.3...v0.15.4) (2020-02-02)
 
+### Features
 
+- Return `shortTitle` in `tableColumns()` result ([810c812](https://github.com/cube-js/cube.js/commit/810c812))
 
+## [0.15.2](https://github.com/cube-js/cube.js/compare/v0.15.1...v0.15.2) (2020-01-25)
 
-## [0.27.26](https://github.com/cube-js/cube.js/compare/v0.27.25...v0.27.26) (2021-06-01)
+### Bug Fixes
 
-**Note:** Version bump only for package @cubejs-client/core
+- **@cubejs-client/core:** improve types ([55edf85](https://github.com/cube-js/cube.js/commit/55edf85)), closes [#350](https://github.com/cube-js/cube.js/issues/350)
+- Time dimension ResultSet backward compatibility to allow work newer client with old server ([b6834b1](https://github.com/cube-js/cube.js/commit/b6834b1)), closes [#356](https://github.com/cube-js/cube.js/issues/356)
 
+# [0.15.0](https://github.com/cube-js/cube.js/compare/v0.14.3...v0.15.0) (2020-01-18)
 
+**Note:** Version bump only for package @cubejs-client/core
 
+# [0.14.0](https://github.com/cube-js/cube.js/compare/v0.13.12...v0.14.0) (2020-01-16)
 
+### Bug Fixes
 
-## [0.27.25](https://github.com/cube-js/cube.js/compare/v0.27.24...v0.27.25) (2021-06-01)
+- Time dimension can't be selected twice within same query with and without granularity ([aa65129](https://github.com/cube-js/cube.js/commit/aa65129))
 
+## [0.13.9](https://github.com/cube-js/cube.js/compare/v0.13.8...v0.13.9) (2020-01-03)
 
 ### Features
 
-* time filter operators ([#2851](https://github.com/cube-js/cube.js/issues/2851)) ([5054249](https://github.com/cube-js/cube.js/commit/505424964d34ae16205485e5347409bb4c5a661d))
+- **@cubejs-client/core:** add types ([abdf089](https://github.com/cube-js/cube.js/commit/abdf089))
 
+## [0.13.7](https://github.com/cube-js/cube.js/compare/v0.13.6...v0.13.7) (2019-12-31)
 
+### Bug Fixes
 
+- **client-core:** Uncaught TypeError: cubejs is not a function ([b5c32cd](https://github.com/cube-js/cube.js/commit/b5c32cd))
 
-
-## [0.27.24](https://github.com/cube-js/cube.js/compare/v0.27.23...v0.27.24) (2021-05-29)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** decompose type ([#2849](https://github.com/cube-js/cube.js/issues/2849)) ([60f2596](https://github.com/cube-js/cube.js/commit/60f25964f8f7aecd8a36cc0f1b811445ae12edc6))
-
-
-
-
-
-## [0.27.22](https://github.com/cube-js/cube.js/compare/v0.27.21...v0.27.22) (2021-05-27)
-
-
-### Features
-
-* **@cubejs-client/vue3:** vue 3 support ([#2827](https://github.com/cube-js/cube.js/issues/2827)) ([6ac2c8c](https://github.com/cube-js/cube.js/commit/6ac2c8c938fee3001f78ef0f8782255799550514))
-
-
-
-
-
-## [0.27.19](https://github.com/cube-js/cube.js/compare/v0.27.18...v0.27.19) (2021-05-24)
-
-
-### Features
-
-* **@cubejs-client/playground:** pre-agg helper ([#2807](https://github.com/cube-js/cube.js/issues/2807)) ([44f09c3](https://github.com/cube-js/cube.js/commit/44f09c39ce3b2a8c6a2ce2fb66b75a0c288eb1da))
-
-
-
-
-
-## [0.27.17](https://github.com/cube-js/cube.js/compare/v0.27.16...v0.27.17) (2021-05-22)
-
-
-### Features
-
-* **@cubejs-client/core:** exporting CubejsApi class ([#2773](https://github.com/cube-js/cube.js/issues/2773)) ([03cfaff](https://github.com/cube-js/cube.js/commit/03cfaff83d2ca1c9e49b6088eab3948d081bb9a9))
-
-
-
-
-
-## [0.27.15](https://github.com/cube-js/cube.js/compare/v0.27.14...v0.27.15) (2021-05-18)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** compareDateRange pivot fix ([#2752](https://github.com/cube-js/cube.js/issues/2752)) ([653ad84](https://github.com/cube-js/cube.js/commit/653ad84f57cc7d5e004c92fe717246ce33d7dcad))
-* **@cubejs-client/core:** Meta types fixes ([#2746](https://github.com/cube-js/cube.js/issues/2746)) ([cd17755](https://github.com/cube-js/cube.js/commit/cd17755a07fe19fbebe44d0193330d43a66b757d))
-
-
-### Features
-
-* **@cubejs-client/playground:** member grouping ([#2736](https://github.com/cube-js/cube.js/issues/2736)) ([7659438](https://github.com/cube-js/cube.js/commit/76594383e08e44354c5966f8e60107d65e05ddab))
-
-
-
-
-
-## [0.27.14](https://github.com/cube-js/cube.js/compare/v0.27.13...v0.27.14) (2021-05-13)
-
-
-### Features
-
-* **@cubejs-client/core:** member sorting ([#2733](https://github.com/cube-js/cube.js/issues/2733)) ([fae3b29](https://github.com/cube-js/cube.js/commit/fae3b293a2ce84ea518567f38546f14acc587e0d))
-
-
-
-
-
-## [0.27.13](https://github.com/cube-js/cube.js/compare/v0.27.12...v0.27.13) (2021-05-13)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** response error handling ([#2703](https://github.com/cube-js/cube.js/issues/2703)) ([de31373](https://github.com/cube-js/cube.js/commit/de31373d9829a6924d7edc04b96464ffa417d920))
-
-
-
-
-
-## [0.27.6](https://github.com/cube-js/cube.js/compare/v0.27.5...v0.27.6) (2021-05-03)
-
-
-### Bug Fixes
-
-* **@cubejs-client/playground:** display server error message ([#2648](https://github.com/cube-js/cube.js/issues/2648)) ([c4d8936](https://github.com/cube-js/cube.js/commit/c4d89369db8796fb136af8370aee2111ac3d0316))
-
-
-
-
-
-## [0.27.5](https://github.com/cube-js/cube.js/compare/v0.27.4...v0.27.5) (2021-05-03)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-# [0.27.0](https://github.com/cube-js/cube.js/compare/v0.26.104...v0.27.0) (2021-04-26)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.26.102](https://github.com/cube-js/cube.js/compare/v0.26.101...v0.26.102) (2021-04-22)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** add type definition to the categories method ([#2585](https://github.com/cube-js/cube.js/issues/2585)) ([4112b2d](https://github.com/cube-js/cube.js/commit/4112b2ddf956537dd1fc3d08b249bef8d07f7645))
-
-
-
-
-
-## [0.26.94](https://github.com/cube-js/cube.js/compare/v0.26.93...v0.26.94) (2021-04-13)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** WebSocket response check ([7af1b45](https://github.com/cube-js/cube.js/commit/7af1b458a9f2d7390e80805241d108b895d5c2cc))
-
-
-
-
-
-## [0.26.93](https://github.com/cube-js/cube.js/compare/v0.26.92...v0.26.93) (2021-04-12)
-
-
-### Bug Fixes
-
-* **@cubejs-client/vue:** make query reactive ([#2539](https://github.com/cube-js/cube.js/issues/2539)) ([9bce6ba](https://github.com/cube-js/cube.js/commit/9bce6ba964d71f0cba0e4d4e4e21a973309d77d4))
-
-
-
-
-
-## [0.26.90](https://github.com/cube-js/cube.js/compare/v0.26.89...v0.26.90) (2021-04-11)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** display request status code ([b6108c9](https://github.com/cube-js/cube.js/commit/b6108c9285ffe177439b2310c201d19f19819206))
-
-
-
-
-
-## [0.26.82](https://github.com/cube-js/cube.js/compare/v0.26.81...v0.26.82) (2021-04-07)
-
-
-### Features
-
-* **@cubejs-client/playground:** run query button, disable query auto triggering ([#2476](https://github.com/cube-js/cube.js/issues/2476)) ([92a5d45](https://github.com/cube-js/cube.js/commit/92a5d45eca00e88e925e547a12c3f69b05bfafa6))
-
-
-
-
-
-## [0.26.73](https://github.com/cube-js/cube.js/compare/v0.26.72...v0.26.73) (2021-04-01)
-
-
-### Features
-
-* Introduce ITransportResponse for HttpTransport/WSTransport, fix [#2439](https://github.com/cube-js/cube.js/issues/2439) ([756bcb8](https://github.com/cube-js/cube.js/commit/756bcb8ae9cd6075382c01a88e46415dd7d024b3))
-
-
-
-
-
-## [0.26.70](https://github.com/cube-js/cube.js/compare/v0.26.69...v0.26.70) (2021-03-26)
-
-
-### Features
-
-* Vue chart renderers ([#2428](https://github.com/cube-js/cube.js/issues/2428)) ([bc2cbab](https://github.com/cube-js/cube.js/commit/bc2cbab22fee860cfc846d1207f6a83899198dd8))
-
-
-
-
-
-## [0.26.69](https://github.com/cube-js/cube.js/compare/v0.26.68...v0.26.69) (2021-03-25)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** Updated totalRow within ResultSet ([#2410](https://github.com/cube-js/cube.js/issues/2410)) ([91e51be](https://github.com/cube-js/cube.js/commit/91e51be6e5690dfe6ba294f75e768406fcc9d4a1))
-
-
-
-
-
-## [0.26.63](https://github.com/cube-js/cube.js/compare/v0.26.62...v0.26.63) (2021-03-22)
-
-
-### Bug Fixes
-
-* **@cubejs-client/ngx:** wrong type reference ([#2407](https://github.com/cube-js/cube.js/issues/2407)) ([d6c4183](https://github.com/cube-js/cube.js/commit/d6c41838df53d18eae23b2d38f86435626568ccf))
-
-
-
-
-
-## [0.26.61](https://github.com/cube-js/cube.js/compare/v0.26.60...v0.26.61) (2021-03-18)
-
-
-### Features
-
-* **@cubejs-client/vue:** vue query builder ([#1824](https://github.com/cube-js/cube.js/issues/1824)) ([06ee13f](https://github.com/cube-js/cube.js/commit/06ee13f72ef33372385567ed5e1795087b4f5f53))
-
-
-
-
-
-## [0.26.60](https://github.com/cube-js/cube.js/compare/v0.26.59...v0.26.60) (2021-03-16)
-
-
-### Features
-
-* **@cubejs-client/playground:** Playground components ([#2329](https://github.com/cube-js/cube.js/issues/2329)) ([489dc12](https://github.com/cube-js/cube.js/commit/489dc12d7e9bfa87bfb3c8ffabf76f238c86a2fe))
-
-
-
-
-
-## [0.26.55](https://github.com/cube-js/cube.js/compare/v0.26.54...v0.26.55) (2021-03-12)
-
-
-### Bug Fixes
-
-* **playground:** Cannot read property 'extendMoment' of undefined ([42fd694](https://github.com/cube-js/cube.js/commit/42fd694f28782413c25356530d6b07db9ea091e0))
-
-
-
-
-
-## [0.26.54](https://github.com/cube-js/cube.js/compare/v0.26.53...v0.26.54) (2021-03-12)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.26.53](https://github.com/cube-js/cube.js/compare/v0.26.52...v0.26.53) (2021-03-11)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.26.45](https://github.com/cube-js/cube.js/compare/v0.26.44...v0.26.45) (2021-03-04)
-
-
-### Bug Fixes
-
-* **@cubejs-client:** react, core TypeScript fixes ([#2261](https://github.com/cube-js/cube.js/issues/2261)). Thanks to @SteffeyDev! ([4db93af](https://github.com/cube-js/cube.js/commit/4db93af984e737d7a6a448facbc8227907007c5d))
-
-
-
-
-
-## [0.26.19](https://github.com/cube-js/cube.js/compare/v0.26.18...v0.26.19) (2021-02-19)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** manage boolean filters for missing members ([#2139](https://github.com/cube-js/cube.js/issues/2139)) ([6fad355](https://github.com/cube-js/cube.js/commit/6fad355ea47c0e9dda1e733345a0de0a0d99e7cb))
-* **@cubejs-client/react:** type fixes ([#2140](https://github.com/cube-js/cube.js/issues/2140)) ([bca1ff7](https://github.com/cube-js/cube.js/commit/bca1ff72b0204a3cce1d4ee658396b3e22adb1cd))
-
-
-
-
-
-## [0.26.13](https://github.com/cube-js/cube.js/compare/v0.26.12...v0.26.13) (2021-02-12)
-
-
-### Features
-
-* **@cubejs-client/playground:** handle missing members ([#2067](https://github.com/cube-js/cube.js/issues/2067)) ([348b245](https://github.com/cube-js/cube.js/commit/348b245f4086095fbe1515d7821d631047f0008c))
-
-
-
-
-
-# [0.26.0](https://github.com/cube-js/cube.js/compare/v0.25.33...v0.26.0) (2021-02-01)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.25.31](https://github.com/cube-js/cube.js/compare/v0.25.30...v0.25.31) (2021-01-28)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** propagate time dimension to the drill down query ([#1911](https://github.com/cube-js/cube.js/issues/1911)) ([59701da](https://github.com/cube-js/cube.js/commit/59701dad6f6cb6d78954d18b309716a9d51aa6b7))
-
-
-
-
-
-# [0.25.0](https://github.com/cube-js/cube.js/compare/v0.24.15...v0.25.0) (2020-12-21)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.24.14](https://github.com/cube-js/cube.js/compare/v0.24.13...v0.24.14) (2020-12-19)
-
-
-### Features
-
-* Add HTTP Post to cubejs client core ([#1608](https://github.com/cube-js/cube.js/issues/1608)). Thanks to [@mnifakram](https://github.com/mnifakram)! ([1ebd6a0](https://github.com/cube-js/cube.js/commit/1ebd6a04ac97b31c6a51ef63bb1d4c040e524190))
-
-
-
-
-
-## [0.24.13](https://github.com/cube-js/cube.js/compare/v0.24.12...v0.24.13) (2020-12-18)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.24.12](https://github.com/cube-js/cube.js/compare/v0.24.11...v0.24.12) (2020-12-17)
-
-
-### Bug Fixes
-
-* **@cubejs-core:** Add type definition for compareDateRange, fix [#1621](https://github.com/cube-js/cube.js/issues/1621) ([#1623](https://github.com/cube-js/cube.js/issues/1623)). Thanks to [@cbroome](https://github.com/cbroome)! ([d8b7f36](https://github.com/cube-js/cube.js/commit/d8b7f3654c705cc020ccfa548b180b56b5422f60))
-
-
-
-
-
-## [0.24.9](https://github.com/cube-js/cube.js/compare/v0.24.8...v0.24.9) (2020-12-16)
-
-
-### Features
-
-* **@cubejs-client/playground:** Angular chart code generation support in Playground ([#1519](https://github.com/cube-js/cube.js/issues/1519)) ([4690e11](https://github.com/cube-js/cube.js/commit/4690e11f417ff65fea8426360f3f5a2b3acd2792)), closes [#1515](https://github.com/cube-js/cube.js/issues/1515) [#1612](https://github.com/cube-js/cube.js/issues/1612)
-
-
-
-
-
-## [0.24.8](https://github.com/cube-js/cube.js/compare/v0.24.7...v0.24.8) (2020-12-15)
-
-
-### Features
-
-* **@cubejs-client/core:** Added pivotConfig option to alias series with a prefix ([#1594](https://github.com/cube-js/cube.js/issues/1594)). Thanks to @MattGson! ([a3342f7](https://github.com/cube-js/cube.js/commit/a3342f7fd0389ce3ad0bc62686c0e787de25f411))
-
-
-
-
-
-## [0.24.4](https://github.com/cube-js/cube.js/compare/v0.24.3...v0.24.4) (2020-12-07)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-# [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.23.14](https://github.com/cube-js/cube.js/compare/v0.23.13...v0.23.14) (2020-11-22)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** propagate segments to drillDown queries ([#1406](https://github.com/cube-js/cube.js/issues/1406)) ([d4ceb65](https://github.com/cube-js/cube.js/commit/d4ceb6502db9c62c0cf95f1e48879f95ea4544d7))
-
-
-
-
-
-## [0.23.12](https://github.com/cube-js/cube.js/compare/v0.23.11...v0.23.12) (2020-11-17)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** pivot should work well with null values ([#1386](https://github.com/cube-js/cube.js/issues/1386)). Thanks to [@mspiegel31](https://github.com/mspiegel31)! ([d4c2446](https://github.com/cube-js/cube.js/commit/d4c24469b8eea2d84f04c540b0a5f9a8d285ad1d))
-
-
-
-
-
-## [0.23.11](https://github.com/cube-js/cube.js/compare/v0.23.10...v0.23.11) (2020-11-13)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** annotation format type ([e5004f6](https://github.com/cube-js/cube.js/commit/e5004f6bf687e7df4b611bf1d772da278558759d))
-* **@cubejs-playground:** boolean filters support ([#1269](https://github.com/cube-js/cube.js/issues/1269)) ([adda809](https://github.com/cube-js/cube.js/commit/adda809e4cd08436ffdf8f3396a6f35725f3dc22))
-
-
-
-
-
-## [0.23.6](https://github.com/cube-js/cube.js/compare/v0.23.5...v0.23.6) (2020-11-02)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-# [0.23.0](https://github.com/cube-js/cube.js/compare/v0.22.4...v0.23.0) (2020-10-28)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.22.2](https://github.com/cube-js/cube.js/compare/v0.22.1...v0.22.2) (2020-10-26)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** duplicate names in ResultSet.seriesNames() ([#1187](https://github.com/cube-js/cube.js/issues/1187)). Thanks to [@aviranmoz](https://github.com/aviranmoz)! ([8d9eb68](https://github.com/cube-js/cube.js/commit/8d9eb68))
-
-
-
-
-
-## [0.22.1](https://github.com/cube-js/cube.js/compare/v0.22.0...v0.22.1) (2020-10-21)
-
-
-### Bug Fixes
-
-* **@cubejs-playground:** avoid unnecessary load calls, dryRun ([#1210](https://github.com/cube-js/cube.js/issues/1210)) ([aaf4911](https://github.com/cube-js/cube.js/commit/aaf4911))
-
-
-
-
-
-# [0.22.0](https://github.com/cube-js/cube.js/compare/v0.21.2...v0.22.0) (2020-10-20)
-
-
-### Bug Fixes
-
-* umd build default export ([#1219](https://github.com/cube-js/cube.js/issues/1219)) ([cc434eb](https://github.com/cube-js/cube.js/commit/cc434eb))
-* **@cubejs-client/core:** Add parseDateMeasures field to CubeJSApiOptions (typings) ([e1a1ada](https://github.com/cube-js/cube.js/commit/e1a1ada))
-
-
-
-
-
-## [0.21.1](https://github.com/cube-js/cube.js/compare/v0.21.0...v0.21.1) (2020-10-15)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-# [0.21.0](https://github.com/cube-js/cube.js/compare/v0.20.15...v0.21.0) (2020-10-09)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.20.12](https://github.com/cube-js/cube.js/compare/v0.20.11...v0.20.12) (2020-10-02)
-
-
-### Features
-
-* angular query builder ([#1073](https://github.com/cube-js/cube.js/issues/1073)) ([ea088b3](https://github.com/cube-js/cube.js/commit/ea088b3))
-
-
-
-
-
-## [0.20.11](https://github.com/cube-js/cube.js/compare/v0.20.10...v0.20.11) (2020-09-28)
-
-
-### Bug Fixes
-
-* propagate drill down parent filters ([#1143](https://github.com/cube-js/cube.js/issues/1143)) ([314985e](https://github.com/cube-js/cube.js/commit/314985e))
-
-
-
-
-
-## [0.20.10](https://github.com/cube-js/cube.js/compare/v0.20.9...v0.20.10) (2020-09-23)
-
-
-### Bug Fixes
-
-* drilling into any measure other than the first ([#1131](https://github.com/cube-js/cube.js/issues/1131)) ([e741a20](https://github.com/cube-js/cube.js/commit/e741a20))
-
-
-
-
-
-## [0.20.9](https://github.com/cube-js/cube.js/compare/v0.20.8...v0.20.9) (2020-09-19)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.20.6](https://github.com/cube-js/cube.js/compare/v0.20.5...v0.20.6) (2020-09-10)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.20.5](https://github.com/cube-js/cube.js/compare/v0.20.4...v0.20.5) (2020-09-10)
-
-
-### Bug Fixes
-
-* cube-client-core resolveMember return type ([#1051](https://github.com/cube-js/cube.js/issues/1051)). Thanks to @Aaronkala ([662cfe0](https://github.com/cube-js/cube.js/commit/662cfe0))
-* improve TimeDimensionGranularity type ([#1052](https://github.com/cube-js/cube.js/issues/1052)). Thanks to [@joealden](https://github.com/joealden) ([1e9bd99](https://github.com/cube-js/cube.js/commit/1e9bd99))
-
-
-
-
-
-## [0.20.3](https://github.com/cube-js/cube.js/compare/v0.20.2...v0.20.3) (2020-09-03)
-
-
-### Bug Fixes
-
-* Export the TimeDimensionGranularity type ([#1044](https://github.com/cube-js/cube.js/issues/1044)). Thanks to [@gudjonragnar](https://github.com/gudjonragnar) ([26b329e](https://github.com/cube-js/cube.js/commit/26b329e))
-
-
-
-
-
-## [0.20.2](https://github.com/cube-js/cube.js/compare/v0.20.1...v0.20.2) (2020-09-02)
-
-
-### Bug Fixes
-
-* subscribe option, new query types to work with ws ([dbf602e](https://github.com/cube-js/cube.js/commit/dbf602e))
-
-
-### Features
-
-* custom date range ([#1027](https://github.com/cube-js/cube.js/issues/1027)) ([304985f](https://github.com/cube-js/cube.js/commit/304985f))
-
-
-
-
-
-## [0.20.1](https://github.com/cube-js/cube.js/compare/v0.20.0...v0.20.1) (2020-09-01)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-# [0.20.0](https://github.com/cube-js/cube.js/compare/v0.19.61...v0.20.0) (2020-08-26)
-
-
-### Bug Fixes
-
-* respect timezone in drillDown queries ([#1003](https://github.com/cube-js/cube.js/issues/1003)) ([c128417](https://github.com/cube-js/cube.js/commit/c128417))
-
-
-### Features
-
-* Data blending ([#1012](https://github.com/cube-js/cube.js/issues/1012)) ([19fd00e](https://github.com/cube-js/cube.js/commit/19fd00e))
-* date range comparison support ([#979](https://github.com/cube-js/cube.js/issues/979)) ([ca21cfd](https://github.com/cube-js/cube.js/commit/ca21cfd))
-* Make the Filter type more specific. ([#915](https://github.com/cube-js/cube.js/issues/915)) Thanks to [@ylixir](https://github.com/ylixir) ([cecdb36](https://github.com/cube-js/cube.js/commit/cecdb36))
-
-
-
-
-
-## [0.19.56](https://github.com/cube-js/cube.js/compare/v0.19.55...v0.19.56) (2020-08-03)
-
-
-### Bug Fixes
-
-* membersForQuery return type ([#909](https://github.com/cube-js/cube.js/issues/909)) ([4976fcf](https://github.com/cube-js/cube.js/commit/4976fcf))
-
-
-
-
-
-## [0.19.55](https://github.com/cube-js/cube.js/compare/v0.19.54...v0.19.55) (2020-07-23)
-
-
-### Features
-
-* expose loadResponse annotation ([#894](https://github.com/cube-js/cube.js/issues/894)) ([2875d47](https://github.com/cube-js/cube.js/commit/2875d47))
-
-
-
-
-
-## [0.19.54](https://github.com/cube-js/cube.js/compare/v0.19.53...v0.19.54) (2020-07-23)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.19.53](https://github.com/cube-js/cube.js/compare/v0.19.52...v0.19.53) (2020-07-20)
-
-
-### Bug Fixes
-
-* preserve order of sorted data ([#870](https://github.com/cube-js/cube.js/issues/870)) ([861db10](https://github.com/cube-js/cube.js/commit/861db10))
-
-
-
-
-
-## [0.19.51](https://github.com/cube-js/cube.js/compare/v0.19.50...v0.19.51) (2020-07-17)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.19.50](https://github.com/cube-js/cube.js/compare/v0.19.49...v0.19.50) (2020-07-16)
-
-
-### Features
-
-* ResultSet serializaion and deserializaion ([#836](https://github.com/cube-js/cube.js/issues/836)) ([80b8d41](https://github.com/cube-js/cube.js/commit/80b8d41))
-
-
-
-
-
-## [0.19.48](https://github.com/cube-js/cube.js/compare/v0.19.47...v0.19.48) (2020-07-11)
-
-
-### Bug Fixes
-
-* **cubejs-client-core:** enums exported from declaration files are not accessible ([#810](https://github.com/cube-js/cube.js/issues/810)) ([3396fbe](https://github.com/cube-js/cube.js/commit/3396fbe))
-
-
-
-
-
-## [0.19.43](https://github.com/cube-js/cube.js/compare/v0.19.42...v0.19.43) (2020-07-04)
-
-
-### Bug Fixes
-
-* **cubejs-client-core:** Display the measure value when the y axis is empty ([#789](https://github.com/cube-js/cube.js/issues/789)) ([7ec6ac6](https://github.com/cube-js/cube.js/commit/7ec6ac6))
-
-
-### Features
-
-* Adjust client options to send credentials when needed ([#790](https://github.com/cube-js/cube.js/issues/790)) Thanks to [@colefichter](https://github.com/colefichter) ! ([5203f6c](https://github.com/cube-js/cube.js/commit/5203f6c)), closes [#788](https://github.com/cube-js/cube.js/issues/788)
-
-
-
-
-
-## [0.19.42](https://github.com/cube-js/cube.js/compare/v0.19.41...v0.19.42) (2020-07-01)
-
-
-### Bug Fixes
-
-* **docs-gen:** generation fixes ([1598a9b](https://github.com/cube-js/cube.js/commit/1598a9b))
-* **docs-gen:** titles ([12a1a5f](https://github.com/cube-js/cube.js/commit/12a1a5f))
-
-
-
-
-
-## [0.19.41](https://github.com/cube-js/cube.js/compare/v0.19.40...v0.19.41) (2020-06-30)
-
-
-### Bug Fixes
-
-* **docs-gen:** generator fixes, docs updates ([c5b26d0](https://github.com/cube-js/cube.js/commit/c5b26d0))
-
-
-
-
-
-## [0.19.40](https://github.com/cube-js/cube.js/compare/v0.19.39...v0.19.40) (2020-06-30)
-
-
-### Features
-
-* **docs-gen:** Typedoc generator ([#769](https://github.com/cube-js/cube.js/issues/769)) ([15373eb](https://github.com/cube-js/cube.js/commit/15373eb))
-
-
-
-
-
-## [0.19.37](https://github.com/cube-js/cube.js/compare/v0.19.36...v0.19.37) (2020-06-26)
-
-
-### Bug Fixes
-
-* **cubejs-client-core:** tableColumns empty data fix ([#750](https://github.com/cube-js/cube.js/issues/750)) ([0ac9b7a](https://github.com/cube-js/cube.js/commit/0ac9b7a))
-
-
-### Features
-
-* query builder pivot config support ([#742](https://github.com/cube-js/cube.js/issues/742)) ([4e29057](https://github.com/cube-js/cube.js/commit/4e29057))
-
-
-
-
-
-## [0.19.35](https://github.com/cube-js/cube.js/compare/v0.19.34...v0.19.35) (2020-06-22)
-
-
-### Bug Fixes
-
-* **cubejs-client-core:** table pivot ([#672](https://github.com/cube-js/cube.js/issues/672)) ([70015f5](https://github.com/cube-js/cube.js/commit/70015f5))
-* table ([#740](https://github.com/cube-js/cube.js/issues/740)) ([6f1a8e7](https://github.com/cube-js/cube.js/commit/6f1a8e7))
-
-
-
-
-
-## [0.19.31](https://github.com/cube-js/cube.js/compare/v0.19.30...v0.19.31) (2020-06-10)
-
-
-### Bug Fixes
-
-* **cubejs-client-core:** Remove Content-Type header from requests in HttpTransport ([#709](https://github.com/cube-js/cube.js/issues/709)) ([f6e366c](https://github.com/cube-js/cube.js/commit/f6e366c))
-
-
-### Features
-
-* Query builder order by ([#685](https://github.com/cube-js/cube.js/issues/685)) ([d3c735b](https://github.com/cube-js/cube.js/commit/d3c735b))
-
-
-
-
-
-## [0.19.23](https://github.com/cube-js/cube.js/compare/v0.19.22...v0.19.23) (2020-06-02)
-
-
-### Features
-
-* drill down queries support ([#664](https://github.com/cube-js/cube.js/issues/664)) ([7e21545](https://github.com/cube-js/cube.js/commit/7e21545)), closes [#190](https://github.com/cube-js/cube.js/issues/190)
-
-
-
-
-
-## [0.19.22](https://github.com/cube-js/cube.js/compare/v0.19.21...v0.19.22) (2020-05-26)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.19.19](https://github.com/cube-js/cube.js/compare/v0.19.18...v0.19.19) (2020-05-15)
-
-
-### Bug Fixes
-
-* corejs version ([8bef3b2](https://github.com/cube-js/cube.js/commit/8bef3b2))
-
-
-### Features
-
-* ability to add custom meta data for measures, dimensions and segments ([#641](https://github.com/cube-js/cube.js/issues/641)) ([88d5c9b](https://github.com/cube-js/cube.js/commit/88d5c9b)), closes [#625](https://github.com/cube-js/cube.js/issues/625)
-
-
-
-
-
-## [0.19.16](https://github.com/cube-js/cube.js/compare/v0.19.15...v0.19.16) (2020-05-07)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.19.14](https://github.com/cube-js/cube.js/compare/v0.19.13...v0.19.14) (2020-04-24)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.19.13](https://github.com/cube-js/cube.js/compare/v0.19.12...v0.19.13) (2020-04-21)
-
-
-### Features
-
-* **react:** `resetResultSetOnChange` option for `QueryRenderer` and `useCubeQuery` ([c8c74d3](https://github.com/cube-js/cube.js/commit/c8c74d3))
-
-
-
-
-
-## [0.19.12](https://github.com/cube-js/cube.js/compare/v0.19.11...v0.19.12) (2020-04-20)
-
-
-### Bug Fixes
-
-* Make date measure parsing optional ([d199cd5](https://github.com/cube-js/cube.js/commit/d199cd5)), closes [#602](https://github.com/cube-js/cube.js/issues/602)
-
-
-
-
-
-## [0.19.9](https://github.com/cube-js/cube.js/compare/v0.19.8...v0.19.9) (2020-04-16)
-
-
-### Features
-
-* Parse dates on client side ([#522](https://github.com/cube-js/cube.js/issues/522)) Thanks to [@richipargo](https://github.com/richipargo)! ([11c1106](https://github.com/cube-js/cube.js/commit/11c1106))
-
-
-
-
-
-## [0.19.7](https://github.com/cube-js/cube.js/compare/v0.19.6...v0.19.7) (2020-04-14)
-
-
-### Features
-
-* Including format and type in tableColumns ([#587](https://github.com/cube-js/cube.js/issues/587)) Thanks to [@danpanaite](https://github.com/danpanaite)! ([3f7d74f](https://github.com/cube-js/cube.js/commit/3f7d74f)), closes [#585](https://github.com/cube-js/cube.js/issues/585)
-
-
-
-
-
-# [0.19.0](https://github.com/cube-js/cube.js/compare/v0.18.32...v0.19.0) (2020-04-09)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.18.18](https://github.com/cube-js/cube.js/compare/v0.18.17...v0.18.18) (2020-03-28)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.18.7](https://github.com/cube-js/cube.js/compare/v0.18.6...v0.18.7) (2020-03-17)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.18.5](https://github.com/cube-js/cube.js/compare/v0.18.4...v0.18.5) (2020-03-15)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** make `progressCallback` optional ([#497](https://github.com/cube-js/cube.js/issues/497)) Thanks to [@hassankhan](https://github.com/hassankhan)! ([a41cf9a](https://github.com/cube-js/cube.js/commit/a41cf9a))
-
-
-
-
-
-## [0.18.4](https://github.com/cube-js/cube.js/compare/v0.18.3...v0.18.4) (2020-03-09)
-
-
-### Bug Fixes
-
-* Request span for WebSocketTransport is incorrectly set ([54ba5da](https://github.com/cube-js/cube.js/commit/54ba5da))
-
-
-
-
-
-# [0.18.0](https://github.com/cube-js/cube.js/compare/v0.17.10...v0.18.0) (2020-03-01)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-## [0.17.10](https://github.com/cube-js/cube.js/compare/v0.17.9...v0.17.10) (2020-02-20)
-
-
-### Bug Fixes
-
-* Revert "feat: Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378))" ([b21cbe6](https://github.com/cube-js/cube.js/commit/b21cbe6)), closes [#418](https://github.com/cube-js/cube.js/issues/418)
-
-
-
-
-
-## [0.17.9](https://github.com/cube-js/cube.js/compare/v0.17.8...v0.17.9) (2020-02-18)
-
-
-### Features
-
-* Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378)) ([cb8d51c](https://github.com/cube-js/cube.js/commit/cb8d51c))
-* Request id trace span ([880f65e](https://github.com/cube-js/cube.js/commit/880f65e))
-
-
-
-
-
-## [0.17.8](https://github.com/cube-js/cube.js/compare/v0.17.7...v0.17.8) (2020-02-14)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** improve types ([#376](https://github.com/cube-js/cube.js/issues/376)) Thanks to [@hassankhan](https://github.com/hassankhan)! ([cfb65a2](https://github.com/cube-js/cube.js/commit/cfb65a2))
-
-
-
-
-
-# [0.17.0](https://github.com/cube-js/cube.js/compare/v0.16.0...v0.17.0) (2020-02-04)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-# [0.16.0](https://github.com/cube-js/cube.js/compare/v0.15.4...v0.16.0) (2020-02-04)
-
-
-### Bug Fixes
-
-* Do not pad `last 24 hours` interval to day ([6554611](https://github.com/cube-js/cube.js/commit/6554611)), closes [#361](https://github.com/cube-js/cube.js/issues/361)
-
-
-
-
-
-## [0.15.4](https://github.com/cube-js/cube.js/compare/v0.15.3...v0.15.4) (2020-02-02)
-
-
-### Features
-
-* Return `shortTitle` in `tableColumns()` result ([810c812](https://github.com/cube-js/cube.js/commit/810c812))
-
-
-
-
-
-## [0.15.2](https://github.com/cube-js/cube.js/compare/v0.15.1...v0.15.2) (2020-01-25)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** improve types ([55edf85](https://github.com/cube-js/cube.js/commit/55edf85)), closes [#350](https://github.com/cube-js/cube.js/issues/350)
-* Time dimension ResultSet backward compatibility to allow work newer client with old server ([b6834b1](https://github.com/cube-js/cube.js/commit/b6834b1)), closes [#356](https://github.com/cube-js/cube.js/issues/356)
-
-
-
-
-
-# [0.15.0](https://github.com/cube-js/cube.js/compare/v0.14.3...v0.15.0) (2020-01-18)
-
-**Note:** Version bump only for package @cubejs-client/core
-
-
-
-
-
-# [0.14.0](https://github.com/cube-js/cube.js/compare/v0.13.12...v0.14.0) (2020-01-16)
-
-
-### Bug Fixes
-
-* Time dimension can't be selected twice within same query with and without granularity ([aa65129](https://github.com/cube-js/cube.js/commit/aa65129))
-
-
-
-
-
-## [0.13.9](https://github.com/cube-js/cube.js/compare/v0.13.8...v0.13.9) (2020-01-03)
-
-
-### Features
-
-* **@cubejs-client/core:** add types ([abdf089](https://github.com/cube-js/cube.js/commit/abdf089))
-
-
-
-
-
-## [0.13.7](https://github.com/cube-js/cube.js/compare/v0.13.6...v0.13.7) (2019-12-31)
-
-
-### Bug Fixes
-
-* **client-core:** Uncaught TypeError: cubejs is not a function ([b5c32cd](https://github.com/cube-js/cube.js/commit/b5c32cd))
-
-
-
-
-
-## [0.13.5](https://github.com/cube-js/cube.js/compare/v0.13.4...v0.13.5) (2019-12-17)
-
+## [0.13.5](https://github.com/cube-js/cube.js/compare/v0.13.4...v0.13.5) (2019-12-17)
 
 ### Features
 
-* Return key in the resultSet.series alongside title ([#291](https://github.com/cube-js/cube.js/issues/291)) ([6144a86](https://github.com/cube-js/cube.js/commit/6144a86))
-
-
-
-
+- Return key in the resultSet.series alongside title ([#291](https://github.com/cube-js/cube.js/issues/291)) ([6144a86](https://github.com/cube-js/cube.js/commit/6144a86))
 
 # [0.13.0](https://github.com/cube-js/cube.js/compare/v0.12.3...v0.13.0) (2019-12-10)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 # [0.12.0](https://github.com/cube-js/cube.js/compare/v0.11.25...v0.12.0) (2019-11-25)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.11.18](https://github.com/cube-js/cube.js/compare/v0.11.17...v0.11.18) (2019-11-09)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.11.10](https://github.com/statsbotco/cubejs-client/compare/v0.11.9...v0.11.10) (2019-10-25)
 
-
 ### Features
 
-* client headers for CubejsApi ([#242](https://github.com/statsbotco/cubejs-client/issues/242)). Thanks to [@ferrants](https://github.com/ferrants)! ([2f75ef3](https://github.com/statsbotco/cubejs-client/commit/2f75ef3)), closes [#241](https://github.com/statsbotco/cubejs-client/issues/241)
-
-
-
-
+- client headers for CubejsApi ([#242](https://github.com/statsbotco/cubejs-client/issues/242)). Thanks to [@ferrants](https://github.com/ferrants)! ([2f75ef3](https://github.com/statsbotco/cubejs-client/commit/2f75ef3)), closes [#241](https://github.com/statsbotco/cubejs-client/issues/241)
 
 ## [0.11.9](https://github.com/statsbotco/cubejs-client/compare/v0.11.8...v0.11.9) (2019-10-23)
 
-
 ### Bug Fixes
 
-* Support `apiToken` to be an async function: first request sends incorrect token ([a2d0c77](https://github.com/statsbotco/cubejs-client/commit/a2d0c77))
-
-
-
-
+- Support `apiToken` to be an async function: first request sends incorrect token ([a2d0c77](https://github.com/statsbotco/cubejs-client/commit/a2d0c77))
 
 ## [0.11.7](https://github.com/statsbotco/cubejs-client/compare/v0.11.6...v0.11.7) (2019-10-22)
 
-
 ### Features
 
-* Support `apiToken` to be an async function ([3a3b5f5](https://github.com/statsbotco/cubejs-client/commit/3a3b5f5))
-
-
-
-
+- Support `apiToken` to be an async function ([3a3b5f5](https://github.com/statsbotco/cubejs-client/commit/3a3b5f5))
 
 ## [0.11.2](https://github.com/statsbotco/cubejs-client/compare/v0.11.1...v0.11.2) (2019-10-15)
 
-
 ### Bug Fixes
 
-* Incorrect URL generation in HttpTransport ([7e7020b](https://github.com/statsbotco/cubejs-client/commit/7e7020b))
-
-
-
-
+- Incorrect URL generation in HttpTransport ([7e7020b](https://github.com/statsbotco/cubejs-client/commit/7e7020b))
 
 # [0.11.0](https://github.com/statsbotco/cubejs-client/compare/v0.10.62...v0.11.0) (2019-10-15)
 
-
 ### Features
 
-* Sockets Preview ([#231](https://github.com/statsbotco/cubejs-client/issues/231)) ([89fc762](https://github.com/statsbotco/cubejs-client/commit/89fc762)), closes [#221](https://github.com/statsbotco/cubejs-client/issues/221)
-
-
-
-
+- Sockets Preview ([#231](https://github.com/statsbotco/cubejs-client/issues/231)) ([89fc762](https://github.com/statsbotco/cubejs-client/commit/89fc762)), closes [#221](https://github.com/statsbotco/cubejs-client/issues/221)
 
 ## [0.10.61](https://github.com/statsbotco/cubejs-client/compare/v0.10.60...v0.10.61) (2019-10-10)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.10.59](https://github.com/statsbotco/cubejs-client/compare/v0.10.58...v0.10.59) (2019-10-08)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.10.56](https://github.com/statsbotco/cubejs-client/compare/v0.10.55...v0.10.56) (2019-10-04)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.10.55](https://github.com/statsbotco/cubejs-client/compare/v0.10.54...v0.10.55) (2019-10-03)
 
-
 ### Bug Fixes
 
-* **client-core:** can't read property 'title' of undefined ([4b48c7f](https://github.com/statsbotco/cubejs-client/commit/4b48c7f))
-
-
-
-
+- **client-core:** can't read property 'title' of undefined ([4b48c7f](https://github.com/statsbotco/cubejs-client/commit/4b48c7f))
 
 ## [0.10.16](https://github.com/statsbotco/cubejs-client/compare/v0.10.15...v0.10.16) (2019-07-20)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.10.15](https://github.com/statsbotco/cubejs-client/compare/v0.10.14...v0.10.15) (2019-07-13)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.10.14](https://github.com/statsbotco/cubejs-client/compare/v0.10.13...v0.10.14) (2019-07-13)
 
-
 ### Features
 
-* **playground:** Show Query ([dc45fcb](https://github.com/statsbotco/cubejs-client/commit/dc45fcb))
-
-
-
-
+- **playground:** Show Query ([dc45fcb](https://github.com/statsbotco/cubejs-client/commit/dc45fcb))
 
 # [0.10.0](https://github.com/statsbotco/cubejs-client/compare/v0.9.24...v0.10.0) (2019-06-21)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.9.12](https://github.com/statsbotco/cubejs-client/compare/v0.9.11...v0.9.12) (2019-06-03)
 
-
 ### Bug Fixes
 
-* **client-core:** Update normalizePivotConfig method to not to fail if x or y are missing ([ee20863](https://github.com/statsbotco/cubejs-client/commit/ee20863)), closes [#10](https://github.com/statsbotco/cubejs-client/issues/10)
-
-
-
-
+- **client-core:** Update normalizePivotConfig method to not to fail if x or y are missing ([ee20863](https://github.com/statsbotco/cubejs-client/commit/ee20863)), closes [#10](https://github.com/statsbotco/cubejs-client/issues/10)
 
 ## [0.9.11](https://github.com/statsbotco/cubejs-client/compare/v0.9.10...v0.9.11) (2019-05-31)
 
-
 ### Bug Fixes
 
-* **client-core:** ResultSet series returns a series with no data ([715e170](https://github.com/statsbotco/cubejs-client/commit/715e170)), closes [#38](https://github.com/statsbotco/cubejs-client/issues/38)
-
-
-
-
+- **client-core:** ResultSet series returns a series with no data ([715e170](https://github.com/statsbotco/cubejs-client/commit/715e170)), closes [#38](https://github.com/statsbotco/cubejs-client/issues/38)
 
 # [0.9.0](https://github.com/statsbotco/cubejs-client/compare/v0.8.7...v0.9.0) (2019-05-11)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.8.7](https://github.com/statsbotco/cubejs-client/compare/v0.8.6...v0.8.7) (2019-05-09)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.8.4](https://github.com/statsbotco/cubejs-client/compare/v0.8.3...v0.8.4) (2019-05-02)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.8.1](https://github.com/statsbotco/cubejs-client/compare/v0.8.0...v0.8.1) (2019-04-30)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 # [0.8.0](https://github.com/statsbotco/cubejs-client/compare/v0.7.10...v0.8.0) (2019-04-29)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.7.10](https://github.com/statsbotco/cubejs-client/compare/v0.7.9...v0.7.10) (2019-04-25)
 
-
 ### Bug Fixes
 
-* **client-core:** Table pivot incorrectly behaves with multiple measures ([adb2270](https://github.com/statsbotco/cubejs-client/commit/adb2270))
-* **client-core:** use ',' as standard axisValue delimiter ([e889955](https://github.com/statsbotco/cubejs-client/commit/e889955)), closes [#19](https://github.com/statsbotco/cubejs-client/issues/19)
-
-
-
-
+- **client-core:** Table pivot incorrectly behaves with multiple measures ([adb2270](https://github.com/statsbotco/cubejs-client/commit/adb2270))
+- **client-core:** use ',' as standard axisValue delimiter ([e889955](https://github.com/statsbotco/cubejs-client/commit/e889955)), closes [#19](https://github.com/statsbotco/cubejs-client/issues/19)
 
 ## [0.7.6](https://github.com/statsbotco/cubejs-client/compare/v0.7.5...v0.7.6) (2019-04-23)
 
-
 ### Bug Fixes
 
-* Use cross-fetch instead of isomorphic-fetch to allow React-Native builds ([#92](https://github.com/statsbotco/cubejs-client/issues/92)) ([79150f4](https://github.com/statsbotco/cubejs-client/commit/79150f4))
-
-
-
-
+- Use cross-fetch instead of isomorphic-fetch to allow React-Native builds ([#92](https://github.com/statsbotco/cubejs-client/issues/92)) ([79150f4](https://github.com/statsbotco/cubejs-client/commit/79150f4))
 
 ## [0.7.3](https://github.com/statsbotco/cubejs-client/compare/v0.7.2...v0.7.3) (2019-04-16)
 
-
 ### Bug Fixes
 
-* Allow SSR: use isomorphic-fetch instead of whatwg-fetch. ([902e581](https://github.com/statsbotco/cubejs-client/commit/902e581)), closes [#1](https://github.com/statsbotco/cubejs-client/issues/1)
-
-
-
-
+- Allow SSR: use isomorphic-fetch instead of whatwg-fetch. ([902e581](https://github.com/statsbotco/cubejs-client/commit/902e581)), closes [#1](https://github.com/statsbotco/cubejs-client/issues/1)
 
 # [0.7.0](https://github.com/statsbotco/cubejs-client/compare/v0.6.2...v0.7.0) (2019-04-15)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 # [0.6.0](https://github.com/statsbotco/cubejs-client/compare/v0.5.2...v0.6.0) (2019-04-09)
 
-
 ### Features
 
-* QueryBuilder heuristics. Playground area, table and number implementation. ([c883a48](https://github.com/statsbotco/cubejs-client/commit/c883a48))
-
-
-
-
+- QueryBuilder heuristics. Playground area, table and number implementation. ([c883a48](https://github.com/statsbotco/cubejs-client/commit/c883a48))
 
 ## [0.5.2](https://github.com/statsbotco/cubejs-client/compare/v0.5.1...v0.5.2) (2019-04-05)
 
-
 ### Features
 
-* Playground UX improvements ([6760a1d](https://github.com/statsbotco/cubejs-client/commit/6760a1d))
-
-
-
-
+- Playground UX improvements ([6760a1d](https://github.com/statsbotco/cubejs-client/commit/6760a1d))
 
 ## [0.5.1](https://github.com/statsbotco/cubejs-client/compare/v0.5.0...v0.5.1) (2019-04-02)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 # [0.5.0](https://github.com/statsbotco/cubejs-client/compare/v0.4.6...v0.5.0) (2019-04-01)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.4.5](https://github.com/statsbotco/cubejs-client/compare/v0.4.4...v0.4.5) (2019-03-21)
 
-
 ### Features
 
-* Playground filters implementation ([de4315d](https://github.com/statsbotco/cubejs-client/commit/de4315d))
-
-
-
-
+- Playground filters implementation ([de4315d](https://github.com/statsbotco/cubejs-client/commit/de4315d))
 
 ## [0.4.4](https://github.com/statsbotco/cubejs-client/compare/v0.4.3...v0.4.4) (2019-03-17)
 
-
 ### Features
 
-* Introduce Schema generation UI in Playground ([349c7d0](https://github.com/statsbotco/cubejs-client/commit/349c7d0))
-
-
-
-
+- Introduce Schema generation UI in Playground ([349c7d0](https://github.com/statsbotco/cubejs-client/commit/349c7d0))
 
 ## [0.4.1](https://github.com/statsbotco/cubejs-client/compare/v0.4.0...v0.4.1) (2019-03-14)
 
 **Note:** Version bump only for package @cubejs-client/core
 
-
-
-
-
 ## [0.3.5-alpha.0](https://github.com/statsbotco/cubejs-client/compare/v0.3.5...v0.3.5-alpha.0) (2019-03-12)
 
 **Note:** Version bump only for package @cubejs-client/core
diff --git a/packages/cubejs-client-core/package.json b/packages/cubejs-client-core/package.json
index 510b064ef5..db53a28f1e 100644
--- a/packages/cubejs-client-core/package.json
+++ b/packages/cubejs-client-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/core",
-  "version": "1.1.12",
+  "version": "1.2.14",
   "engines": {},
   "repository": {
     "type": "git",
@@ -42,7 +42,7 @@
     "eslint": "^7.21.0",
     "eslint-config-airbnb-base": "^13.1.0",
     "eslint-plugin-import": "^2.16.0",
-    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-node": "^10.0.0",
     "jest": "^27"
   }
 }
diff --git a/packages/cubejs-client-dx/CHANGELOG.md b/packages/cubejs-client-dx/CHANGELOG.md
index 5f515b718b..44518c41aa 100644
--- a/packages/cubejs-client-dx/CHANGELOG.md
+++ b/packages/cubejs-client-dx/CHANGELOG.md
@@ -3,135 +3,132 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.1.12](https://github.com/cube-js/cube/compare/v1.1.11...v1.1.12) (2025-01-09)
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
 
+**Note:** Version bump only for package @cubejs-client/dx
 
-### Features
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
 
-* **server-core:** Support for scheduledRefreshTimeZones as function, passing securityContext ([#9002](https://github.com/cube-js/cube/issues/9002)) ([10e47fc](https://github.com/cube-js/cube/commit/10e47fc5472a3532a8f40f6f980f9802536a39de))
+**Note:** Version bump only for package @cubejs-client/dx
 
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
 
+**Note:** Version bump only for package @cubejs-client/dx
 
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
 
+**Note:** Version bump only for package @cubejs-client/dx
 
-# [1.0.0](https://github.com/cube-js/cube/compare/v0.36.11...v1.0.0) (2024-10-15)
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
 
 **Note:** Version bump only for package @cubejs-client/dx
 
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
 
+**Note:** Version bump only for package @cubejs-client/dx
 
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
 
+**Note:** Version bump only for package @cubejs-client/dx
 
-# [0.36.0](https://github.com/cube-js/cube/compare/v0.35.81...v0.36.0) (2024-09-13)
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
 
 **Note:** Version bump only for package @cubejs-client/dx
 
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
 
+**Note:** Version bump only for package @cubejs-client/dx
 
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
 
+**Note:** Version bump only for package @cubejs-client/dx
 
-# [0.35.0](https://github.com/cube-js/cube/compare/v0.34.62...v0.35.0) (2024-03-14)
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
 
 **Note:** Version bump only for package @cubejs-client/dx
 
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-client/dx
 
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-client/dx
 
-## [0.34.32](https://github.com/cube-js/cube/compare/v0.34.31...v0.34.32) (2023-12-07)
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
 
 **Note:** Version bump only for package @cubejs-client/dx
 
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
 
+**Note:** Version bump only for package @cubejs-client/dx
 
+## [1.1.12](https://github.com/cube-js/cube/compare/v1.1.11...v1.1.12) (2025-01-09)
+
+### Features
 
+- **server-core:** Support for scheduledRefreshTimeZones as function, passing securityContext ([#9002](https://github.com/cube-js/cube/issues/9002)) ([10e47fc](https://github.com/cube-js/cube/commit/10e47fc5472a3532a8f40f6f980f9802536a39de))
 
-## [0.34.31](https://github.com/cube-js/cube/compare/v0.34.30...v0.34.31) (2023-12-07)
+# [1.0.0](https://github.com/cube-js/cube/compare/v0.36.11...v1.0.0) (2024-10-15)
 
 **Note:** Version bump only for package @cubejs-client/dx
 
+# [0.36.0](https://github.com/cube-js/cube/compare/v0.35.81...v0.36.0) (2024-09-13)
 
+**Note:** Version bump only for package @cubejs-client/dx
 
+# [0.35.0](https://github.com/cube-js/cube/compare/v0.34.62...v0.35.0) (2024-03-14)
 
+**Note:** Version bump only for package @cubejs-client/dx
 
-# [0.34.0](https://github.com/cube-js/cube/compare/v0.33.65...v0.34.0) (2023-10-03)
+## [0.34.32](https://github.com/cube-js/cube/compare/v0.34.31...v0.34.32) (2023-12-07)
 
 **Note:** Version bump only for package @cubejs-client/dx
 
+## [0.34.31](https://github.com/cube-js/cube/compare/v0.34.30...v0.34.31) (2023-12-07)
 
+**Note:** Version bump only for package @cubejs-client/dx
 
+# [0.34.0](https://github.com/cube-js/cube/compare/v0.33.65...v0.34.0) (2023-10-03)
 
+**Note:** Version bump only for package @cubejs-client/dx
 
 # [0.33.0](https://github.com/cube-js/cube/compare/v0.32.31...v0.33.0) (2023-05-02)
 
 **Note:** Version bump only for package @cubejs-client/dx
 
-
-
-
-
 ## [0.32.17](https://github.com/cube-js/cube/compare/v0.32.16...v0.32.17) (2023-03-29)
 
 **Note:** Version bump only for package @cubejs-client/dx
 
-
-
-
-
 ## [0.32.12](https://github.com/cube-js/cube/compare/v0.32.11...v0.32.12) (2023-03-22)
 
 **Note:** Version bump only for package @cubejs-client/dx
 
-
-
-
-
 # [0.32.0](https://github.com/cube-js/cube.js/compare/v0.31.69...v0.32.0) (2023-03-02)
 
 **Note:** Version bump only for package @cubejs-client/dx
 
-
-
-
-
 ## [0.31.30](https://github.com/cube-js/cube.js/compare/v0.31.29...v0.31.30) (2022-12-22)
 
 **Note:** Version bump only for package @cubejs-client/dx
 
-
-
-
-
 # [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
 
 **Note:** Version bump only for package @cubejs-client/dx
 
-
-
-
-
 # [0.30.0](https://github.com/cube-js/cube.js/compare/v0.29.57...v0.30.0) (2022-05-11)
 
 **Note:** Version bump only for package @cubejs-client/dx
 
-
-
-
-
 ## [0.29.51](https://github.com/cube-js/cube.js/compare/v0.29.50...v0.29.51) (2022-04-22)
 
-
 ### Features
 
-* **query-language:** "startsWith", "endsWith" filters support ([#4128](https://github.com/cube-js/cube.js/issues/4128)) ([e8c72d6](https://github.com/cube-js/cube.js/commit/e8c72d630eecd930a8fd36fc52f9b594a45d59c0))
-
-
-
-
+- **query-language:** "startsWith", "endsWith" filters support ([#4128](https://github.com/cube-js/cube.js/issues/4128)) ([e8c72d6](https://github.com/cube-js/cube.js/commit/e8c72d630eecd930a8fd36fc52f9b594a45d59c0))
 
 ## [0.29.5](https://github.com/cube-js/cube.js/compare/v0.29.4...v0.29.5) (2021-12-17)
 
-
 ### Features
 
-* **@cubejs-client/dx:** introduce new dependency for Cube.js Client ([5bfaf1c](https://github.com/cube-js/cube.js/commit/5bfaf1cf99d68dfcdddb04f2b3151ad451657ff9))
+- **@cubejs-client/dx:** introduce new dependency for Cube.js Client ([5bfaf1c](https://github.com/cube-js/cube.js/commit/5bfaf1cf99d68dfcdddb04f2b3151ad451657ff9))
diff --git a/packages/cubejs-client-dx/package.json b/packages/cubejs-client-dx/package.json
index d3bc232035..e6ce093f3c 100644
--- a/packages/cubejs-client-dx/package.json
+++ b/packages/cubejs-client-dx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/dx",
-  "version": "1.1.12",
+  "version": "1.2.14",
   "engines": {},
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "eslint": "^7.21.0",
     "eslint-config-airbnb-base": "^13.1.0",
     "eslint-plugin-import": "^2.16.0",
-    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-node": "^10.0.0",
     "jest": "^27"
   },
   "jest": {
diff --git a/packages/cubejs-client-ngx/.gitignore b/packages/cubejs-client-ngx/.gitignore
index 3058b72e01..a3e320dcfb 100644
--- a/packages/cubejs-client-ngx/.gitignore
+++ b/packages/cubejs-client-ngx/.gitignore
@@ -1,3 +1,4 @@
 dist/
 .yalc/
-yalc.lock
\ No newline at end of file
+yalc.lock
+.angular/
diff --git a/packages/cubejs-client-ngx/CHANGELOG.md b/packages/cubejs-client-ngx/CHANGELOG.md
index fdefeb7a47..dedb5ca622 100644
--- a/packages/cubejs-client-ngx/CHANGELOG.md
+++ b/packages/cubejs-client-ngx/CHANGELOG.md
@@ -3,1065 +3,614 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.1.12](https://github.com/cube-js/cube/compare/v1.1.11...v1.1.12) (2025-01-09)
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-# [1.0.0](https://github.com/cube-js/cube/compare/v0.36.11...v1.0.0) (2024-10-15)
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-# [0.36.0](https://github.com/cube-js/cube/compare/v0.35.81...v0.36.0) (2024-09-13)
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-# [0.35.0](https://github.com/cube-js/cube/compare/v0.34.62...v0.35.0) (2024-03-14)
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-## [0.34.41](https://github.com/cube-js/cube/compare/v0.34.40...v0.34.41) (2024-01-02)
-
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
 
-### Bug Fixes
+**Note:** Version bump only for package @cubejs-client/ngx
 
-* **@cubejs-client/ngx:** set module to fesm2015 ([#7571](https://github.com/cube-js/cube/issues/7571)) Thanks [@loremaps](https://github.com/loremaps)! ([aaa8bfd](https://github.com/cube-js/cube/commit/aaa8bfd23e91ff033b4c048c4e6ee4e419c45d98)), closes [#7570](https://github.com/cube-js/cube/issues/7570)
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
 
-## [0.34.27](https://github.com/cube-js/cube/compare/v0.34.26...v0.34.27) (2023-11-30)
+### Bug Fixes
 
+- **@cubejs-client/ngx:** Update APF configuration and build settings for Angular 12+ compatibility ([#9152](https://github.com/cube-js/cube/issues/9152)) Thanks to @HaidarZ! ([57bcbc4](https://github.com/cube-js/cube/commit/57bcbc482002aaa025ba5eab8960ecc5784faa55))
 
-### Features
+## [1.1.12](https://github.com/cube-js/cube/compare/v1.1.11...v1.1.12) (2025-01-09)
 
-* **client-ngx:** enable ivy ([#7479](https://github.com/cube-js/cube/issues/7479)) ([a3c2bbb](https://github.com/cube-js/cube/commit/a3c2bbb760a166d796f4080913bdfc1d352af8bd))
+**Note:** Version bump only for package @cubejs-client/ngx
 
+# [1.0.0](https://github.com/cube-js/cube/compare/v0.36.11...v1.0.0) (2024-10-15)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+# [0.36.0](https://github.com/cube-js/cube/compare/v0.35.81...v0.36.0) (2024-09-13)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-# [0.34.0](https://github.com/cube-js/cube/compare/v0.33.65...v0.34.0) (2023-10-03)
+# [0.35.0](https://github.com/cube-js/cube/compare/v0.34.62...v0.35.0) (2024-03-14)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.34.41](https://github.com/cube-js/cube/compare/v0.34.40...v0.34.41) (2024-01-02)
 
+### Bug Fixes
 
+- **@cubejs-client/ngx:** set module to fesm2015 ([#7571](https://github.com/cube-js/cube/issues/7571)) Thanks [@loremaps](https://github.com/loremaps)! ([aaa8bfd](https://github.com/cube-js/cube/commit/aaa8bfd23e91ff033b4c048c4e6ee4e419c45d98)), closes [#7570](https://github.com/cube-js/cube/issues/7570)
 
+## [0.34.27](https://github.com/cube-js/cube/compare/v0.34.26...v0.34.27) (2023-11-30)
 
-# [0.33.0](https://github.com/cube-js/cube/compare/v0.32.31...v0.33.0) (2023-05-02)
+### Features
 
-**Note:** Version bump only for package @cubejs-client/ngx
+- **client-ngx:** enable ivy ([#7479](https://github.com/cube-js/cube/issues/7479)) ([a3c2bbb](https://github.com/cube-js/cube/commit/a3c2bbb760a166d796f4080913bdfc1d352af8bd))
 
+# [0.34.0](https://github.com/cube-js/cube/compare/v0.33.65...v0.34.0) (2023-10-03)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+# [0.33.0](https://github.com/cube-js/cube/compare/v0.32.31...v0.33.0) (2023-05-02)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
 ## [0.32.17](https://github.com/cube-js/cube/compare/v0.32.16...v0.32.17) (2023-03-29)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 ## [0.32.12](https://github.com/cube-js/cube/compare/v0.32.11...v0.32.12) (2023-03-22)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 # [0.32.0](https://github.com/cube-js/cube.js/compare/v0.31.69...v0.32.0) (2023-03-02)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 ## [0.31.30](https://github.com/cube-js/cube.js/compare/v0.31.29...v0.31.30) (2022-12-22)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 # [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 ## [0.30.69](https://github.com/cube-js/cube.js/compare/v0.30.68...v0.30.69) (2022-09-13)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 # [0.30.0](https://github.com/cube-js/cube.js/compare/v0.29.57...v0.30.0) (2022-05-11)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 ## [0.29.26](https://github.com/cube-js/cube.js/compare/v0.29.25...v0.29.26) (2022-02-07)
 
-
 ### Bug Fixes
 
-* **@cubejs-client/ngx:** cubejs.watch() not producing errors ([#3974](https://github.com/cube-js/cube.js/issues/3974)) Thanks @PieterVanZyl-Dev! ([1ee6740](https://github.com/cube-js/cube.js/commit/1ee6740abb51b84296ae65ee565114269b621b65)), closes [#3961](https://github.com/cube-js/cube.js/issues/3961)
-
-
-
-
+- **@cubejs-client/ngx:** cubejs.watch() not producing errors ([#3974](https://github.com/cube-js/cube.js/issues/3974)) Thanks @PieterVanZyl-Dev! ([1ee6740](https://github.com/cube-js/cube.js/commit/1ee6740abb51b84296ae65ee565114269b621b65)), closes [#3961](https://github.com/cube-js/cube.js/issues/3961)
 
 # [0.29.0](https://github.com/cube-js/cube.js/compare/v0.28.67...v0.29.0) (2021-12-14)
 
-
 ### chore
 
-* angular 12 ([#2863](https://github.com/cube-js/cube.js/issues/2863)) ([18efb65](https://github.com/cube-js/cube.js/commit/18efb65b3acbbd7da00ae02967d13070e9a33a90))
-
+- angular 12 ([#2863](https://github.com/cube-js/cube.js/issues/2863)) ([18efb65](https://github.com/cube-js/cube.js/commit/18efb65b3acbbd7da00ae02967d13070e9a33a90))
 
 ### BREAKING CHANGES
 
-* drop Angular 10/11 support
+- drop Angular 10/11 support
 
+## [0.28.51](https://github.com/cube-js/cube.js/compare/v0.28.50...v0.28.51) (2021-10-30)
 
+### Bug Fixes
 
+- **cubejs-client-ngx:** FilterMember.replace() will no longer update all filters with replacement ([#3597](https://github.com/cube-js/cube.js/issues/3597)) ([f972ad3](https://github.com/cube-js/cube.js/commit/f972ad375a7baccf3f67b58a8f2148ab8b278201))
 
+## [0.28.10](https://github.com/cube-js/cube.js/compare/v0.28.9...v0.28.10) (2021-07-30)
 
-## [0.28.51](https://github.com/cube-js/cube.js/compare/v0.28.50...v0.28.51) (2021-10-30)
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.28.6](https://github.com/cube-js/cube.js/compare/v0.28.5...v0.28.6) (2021-07-22)
 
 ### Bug Fixes
 
-* **cubejs-client-ngx:** FilterMember.replace() will no longer update all filters with replacement ([#3597](https://github.com/cube-js/cube.js/issues/3597)) ([f972ad3](https://github.com/cube-js/cube.js/commit/f972ad375a7baccf3f67b58a8f2148ab8b278201))
-
-
+- **@cubejs-client/playground:** week granularity ([#3146](https://github.com/cube-js/cube.js/issues/3146)) ([9697a64](https://github.com/cube-js/cube.js/commit/9697a646e5e58edc54c4b08a810e0faecc4d0c69))
 
+### Features
 
+- **@cubejs-client/ngx:** async CubejsClient initialization ([#2876](https://github.com/cube-js/cube.js/issues/2876)) ([bba3a01](https://github.com/cube-js/cube.js/commit/bba3a01d2a072093509633f2d26e8df9677f940c))
 
-## [0.28.10](https://github.com/cube-js/cube.js/compare/v0.28.9...v0.28.10) (2021-07-30)
+# [0.28.0](https://github.com/cube-js/cube.js/compare/v0.27.53...v0.28.0) (2021-07-17)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.27.51](https://github.com/cube-js/cube.js/compare/v0.27.50...v0.27.51) (2021-07-13)
 
+### Bug Fixes
 
+- **@cubejs-client/core:** incorrect types for logical and/or in query filters ([#3083](https://github.com/cube-js/cube.js/issues/3083)) ([d7014a2](https://github.com/cube-js/cube.js/commit/d7014a21add8d264d92987a3c840d98d09545457))
 
+## [0.27.25](https://github.com/cube-js/cube.js/compare/v0.27.24...v0.27.25) (2021-06-01)
 
-## [0.28.6](https://github.com/cube-js/cube.js/compare/v0.28.5...v0.28.6) (2021-07-22)
+### Features
 
+- time filter operators ([#2851](https://github.com/cube-js/cube.js/issues/2851)) ([5054249](https://github.com/cube-js/cube.js/commit/505424964d34ae16205485e5347409bb4c5a661d))
 
-### Bug Fixes
+# [0.27.0](https://github.com/cube-js/cube.js/compare/v0.26.104...v0.27.0) (2021-04-26)
 
-* **@cubejs-client/playground:** week granularity ([#3146](https://github.com/cube-js/cube.js/issues/3146)) ([9697a64](https://github.com/cube-js/cube.js/commit/9697a646e5e58edc54c4b08a810e0faecc4d0c69))
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.26.61](https://github.com/cube-js/cube.js/compare/v0.26.60...v0.26.61) (2021-03-18)
 
 ### Features
 
-* **@cubejs-client/ngx:** async CubejsClient initialization ([#2876](https://github.com/cube-js/cube.js/issues/2876)) ([bba3a01](https://github.com/cube-js/cube.js/commit/bba3a01d2a072093509633f2d26e8df9677f940c))
+- **@cubejs-client/vue:** vue query builder ([#1824](https://github.com/cube-js/cube.js/issues/1824)) ([06ee13f](https://github.com/cube-js/cube.js/commit/06ee13f72ef33372385567ed5e1795087b4f5f53))
 
+## [0.26.54](https://github.com/cube-js/cube.js/compare/v0.26.53...v0.26.54) (2021-03-12)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.26.53](https://github.com/cube-js/cube.js/compare/v0.26.52...v0.26.53) (2021-03-11)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-# [0.28.0](https://github.com/cube-js/cube.js/compare/v0.27.53...v0.28.0) (2021-07-17)
+# [0.26.0](https://github.com/cube-js/cube.js/compare/v0.25.33...v0.26.0) (2021-02-01)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.25.22](https://github.com/cube-js/cube.js/compare/v0.25.21...v0.25.22) (2021-01-21)
 
+### Features
 
+- **@cubejs-client/playground:** Database connection wizard ([#1671](https://github.com/cube-js/cube.js/issues/1671)) ([ba30883](https://github.com/cube-js/cube.js/commit/ba30883617c806c9f19ed6c879d0b0c2d656aae1))
 
+# [0.25.0](https://github.com/cube-js/cube.js/compare/v0.24.15...v0.25.0) (2020-12-21)
 
-## [0.27.51](https://github.com/cube-js/cube.js/compare/v0.27.50...v0.27.51) (2021-07-13)
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.24.4](https://github.com/cube-js/cube.js/compare/v0.24.3...v0.24.4) (2020-12-07)
 
-### Bug Fixes
+**Note:** Version bump only for package @cubejs-client/ngx
 
-* **@cubejs-client/core:** incorrect types for logical and/or in query filters ([#3083](https://github.com/cube-js/cube.js/issues/3083)) ([d7014a2](https://github.com/cube-js/cube.js/commit/d7014a21add8d264d92987a3c840d98d09545457))
+# [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.23.8](https://github.com/cube-js/cube.js/compare/v0.23.7...v0.23.8) (2020-11-06)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.23.6](https://github.com/cube-js/cube.js/compare/v0.23.5...v0.23.6) (2020-11-02)
 
-## [0.27.25](https://github.com/cube-js/cube.js/compare/v0.27.24...v0.27.25) (2021-06-01)
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.23.3](https://github.com/cube-js/cube.js/compare/v0.23.2...v0.23.3) (2020-10-31)
 
 ### Features
 
-* time filter operators ([#2851](https://github.com/cube-js/cube.js/issues/2851)) ([5054249](https://github.com/cube-js/cube.js/commit/505424964d34ae16205485e5347409bb4c5a661d))
-
-
+- Dynamic Angular template ([#1257](https://github.com/cube-js/cube.js/issues/1257)) ([86ba728](https://github.com/cube-js/cube.js/commit/86ba728))
 
+# [0.23.0](https://github.com/cube-js/cube.js/compare/v0.22.4...v0.23.0) (2020-10-28)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-# [0.27.0](https://github.com/cube-js/cube.js/compare/v0.26.104...v0.27.0) (2021-04-26)
+# [0.22.0](https://github.com/cube-js/cube.js/compare/v0.21.2...v0.22.0) (2020-10-20)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.21.1](https://github.com/cube-js/cube.js/compare/v0.21.0...v0.21.1) (2020-10-15)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+# [0.21.0](https://github.com/cube-js/cube.js/compare/v0.20.15...v0.21.0) (2020-10-09)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-## [0.26.61](https://github.com/cube-js/cube.js/compare/v0.26.60...v0.26.61) (2021-03-18)
-
+## [0.20.12](https://github.com/cube-js/cube.js/compare/v0.20.11...v0.20.12) (2020-10-02)
 
 ### Features
 
-* **@cubejs-client/vue:** vue query builder ([#1824](https://github.com/cube-js/cube.js/issues/1824)) ([06ee13f](https://github.com/cube-js/cube.js/commit/06ee13f72ef33372385567ed5e1795087b4f5f53))
+- angular query builder ([#1073](https://github.com/cube-js/cube.js/issues/1073)) ([ea088b3](https://github.com/cube-js/cube.js/commit/ea088b3))
 
+## [0.20.11](https://github.com/cube-js/cube.js/compare/v0.20.10...v0.20.11) (2020-09-28)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.20.10](https://github.com/cube-js/cube.js/compare/v0.20.9...v0.20.10) (2020-09-23)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-## [0.26.54](https://github.com/cube-js/cube.js/compare/v0.26.53...v0.26.54) (2021-03-12)
+## [0.20.9](https://github.com/cube-js/cube.js/compare/v0.20.8...v0.20.9) (2020-09-19)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.20.6](https://github.com/cube-js/cube.js/compare/v0.20.5...v0.20.6) (2020-09-10)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.20.5](https://github.com/cube-js/cube.js/compare/v0.20.4...v0.20.5) (2020-09-10)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-## [0.26.53](https://github.com/cube-js/cube.js/compare/v0.26.52...v0.26.53) (2021-03-11)
+## [0.20.3](https://github.com/cube-js/cube.js/compare/v0.20.2...v0.20.3) (2020-09-03)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.20.2](https://github.com/cube-js/cube.js/compare/v0.20.1...v0.20.2) (2020-09-02)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.20.1](https://github.com/cube-js/cube.js/compare/v0.20.0...v0.20.1) (2020-09-01)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-# [0.26.0](https://github.com/cube-js/cube.js/compare/v0.25.33...v0.26.0) (2021-02-01)
+# [0.20.0](https://github.com/cube-js/cube.js/compare/v0.19.61...v0.20.0) (2020-08-26)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.56](https://github.com/cube-js/cube.js/compare/v0.19.55...v0.19.56) (2020-08-03)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.55](https://github.com/cube-js/cube.js/compare/v0.19.54...v0.19.55) (2020-07-23)
 
+### Bug Fixes
 
-## [0.25.22](https://github.com/cube-js/cube.js/compare/v0.25.21...v0.25.22) (2021-01-21)
-
+- ngx client installation ([#898](https://github.com/cube-js/cube.js/issues/898)) ([31ab9a0](https://github.com/cube-js/cube.js/commit/31ab9a0))
 
-### Features
+## [0.19.54](https://github.com/cube-js/cube.js/compare/v0.19.53...v0.19.54) (2020-07-23)
 
-* **@cubejs-client/playground:** Database connection wizard ([#1671](https://github.com/cube-js/cube.js/issues/1671)) ([ba30883](https://github.com/cube-js/cube.js/commit/ba30883617c806c9f19ed6c879d0b0c2d656aae1))
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.53](https://github.com/cube-js/cube.js/compare/v0.19.52...v0.19.53) (2020-07-20)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.51](https://github.com/cube-js/cube.js/compare/v0.19.50...v0.19.51) (2020-07-17)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-# [0.25.0](https://github.com/cube-js/cube.js/compare/v0.24.15...v0.25.0) (2020-12-21)
+## [0.19.50](https://github.com/cube-js/cube.js/compare/v0.19.49...v0.19.50) (2020-07-16)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.48](https://github.com/cube-js/cube.js/compare/v0.19.47...v0.19.48) (2020-07-11)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.43](https://github.com/cube-js/cube.js/compare/v0.19.42...v0.19.43) (2020-07-04)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-## [0.24.4](https://github.com/cube-js/cube.js/compare/v0.24.3...v0.24.4) (2020-12-07)
+## [0.19.42](https://github.com/cube-js/cube.js/compare/v0.19.41...v0.19.42) (2020-07-01)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.41](https://github.com/cube-js/cube.js/compare/v0.19.40...v0.19.41) (2020-06-30)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.40](https://github.com/cube-js/cube.js/compare/v0.19.39...v0.19.40) (2020-06-30)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-# [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
+## [0.19.37](https://github.com/cube-js/cube.js/compare/v0.19.36...v0.19.37) (2020-06-26)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.35](https://github.com/cube-js/cube.js/compare/v0.19.34...v0.19.35) (2020-06-22)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.31](https://github.com/cube-js/cube.js/compare/v0.19.30...v0.19.31) (2020-06-10)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-## [0.23.8](https://github.com/cube-js/cube.js/compare/v0.23.7...v0.23.8) (2020-11-06)
+## [0.19.23](https://github.com/cube-js/cube.js/compare/v0.19.22...v0.19.23) (2020-06-02)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.22](https://github.com/cube-js/cube.js/compare/v0.19.21...v0.19.22) (2020-05-26)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.19](https://github.com/cube-js/cube.js/compare/v0.19.18...v0.19.19) (2020-05-15)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-## [0.23.6](https://github.com/cube-js/cube.js/compare/v0.23.5...v0.23.6) (2020-11-02)
+## [0.19.16](https://github.com/cube-js/cube.js/compare/v0.19.15...v0.19.16) (2020-05-07)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.14](https://github.com/cube-js/cube.js/compare/v0.19.13...v0.19.14) (2020-04-24)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.13](https://github.com/cube-js/cube.js/compare/v0.19.12...v0.19.13) (2020-04-21)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-## [0.23.3](https://github.com/cube-js/cube.js/compare/v0.23.2...v0.23.3) (2020-10-31)
+## [0.19.12](https://github.com/cube-js/cube.js/compare/v0.19.11...v0.19.12) (2020-04-20)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-### Features
+## [0.19.9](https://github.com/cube-js/cube.js/compare/v0.19.8...v0.19.9) (2020-04-16)
 
-* Dynamic Angular template ([#1257](https://github.com/cube-js/cube.js/issues/1257)) ([86ba728](https://github.com/cube-js/cube.js/commit/86ba728))
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.19.7](https://github.com/cube-js/cube.js/compare/v0.19.6...v0.19.7) (2020-04-14)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+# [0.19.0](https://github.com/cube-js/cube.js/compare/v0.18.32...v0.19.0) (2020-04-09)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-# [0.23.0](https://github.com/cube-js/cube.js/compare/v0.22.4...v0.23.0) (2020-10-28)
+## [0.18.18](https://github.com/cube-js/cube.js/compare/v0.18.17...v0.18.18) (2020-03-28)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.18.7](https://github.com/cube-js/cube.js/compare/v0.18.6...v0.18.7) (2020-03-17)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.18.6](https://github.com/cube-js/cube.js/compare/v0.18.5...v0.18.6) (2020-03-16)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-# [0.22.0](https://github.com/cube-js/cube.js/compare/v0.21.2...v0.22.0) (2020-10-20)
+## [0.18.5](https://github.com/cube-js/cube.js/compare/v0.18.4...v0.18.5) (2020-03-15)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.18.4](https://github.com/cube-js/cube.js/compare/v0.18.3...v0.18.4) (2020-03-09)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+# [0.18.0](https://github.com/cube-js/cube.js/compare/v0.17.10...v0.18.0) (2020-03-01)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-## [0.21.1](https://github.com/cube-js/cube.js/compare/v0.21.0...v0.21.1) (2020-10-15)
+## [0.17.10](https://github.com/cube-js/cube.js/compare/v0.17.9...v0.17.10) (2020-02-20)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.17.9](https://github.com/cube-js/cube.js/compare/v0.17.8...v0.17.9) (2020-02-18)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.17.8](https://github.com/cube-js/cube.js/compare/v0.17.7...v0.17.8) (2020-02-14)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-# [0.21.0](https://github.com/cube-js/cube.js/compare/v0.20.15...v0.21.0) (2020-10-09)
+# [0.17.0](https://github.com/cube-js/cube.js/compare/v0.16.0...v0.17.0) (2020-02-04)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+# [0.16.0](https://github.com/cube-js/cube.js/compare/v0.15.4...v0.16.0) (2020-02-04)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.15.4](https://github.com/cube-js/cube.js/compare/v0.15.3...v0.15.4) (2020-02-02)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-## [0.20.12](https://github.com/cube-js/cube.js/compare/v0.20.11...v0.20.12) (2020-10-02)
+## [0.15.2](https://github.com/cube-js/cube.js/compare/v0.15.1...v0.15.2) (2020-01-25)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-### Features
+# [0.15.0](https://github.com/cube-js/cube.js/compare/v0.14.3...v0.15.0) (2020-01-18)
 
-* angular query builder ([#1073](https://github.com/cube-js/cube.js/issues/1073)) ([ea088b3](https://github.com/cube-js/cube.js/commit/ea088b3))
+**Note:** Version bump only for package @cubejs-client/ngx
 
+# [0.14.0](https://github.com/cube-js/cube.js/compare/v0.13.12...v0.14.0) (2020-01-16)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.13.12](https://github.com/cube-js/cube.js/compare/v0.13.11...v0.13.12) (2020-01-12)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-## [0.20.11](https://github.com/cube-js/cube.js/compare/v0.20.10...v0.20.11) (2020-09-28)
+## [0.13.9](https://github.com/cube-js/cube.js/compare/v0.13.8...v0.13.9) (2020-01-03)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.13.7](https://github.com/cube-js/cube.js/compare/v0.13.6...v0.13.7) (2019-12-31)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.13.5](https://github.com/cube-js/cube.js/compare/v0.13.4...v0.13.5) (2019-12-17)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-## [0.20.10](https://github.com/cube-js/cube.js/compare/v0.20.9...v0.20.10) (2020-09-23)
+# [0.13.0](https://github.com/cube-js/cube.js/compare/v0.12.3...v0.13.0) (2019-12-10)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+# [0.12.0](https://github.com/cube-js/cube.js/compare/v0.11.25...v0.12.0) (2019-11-25)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.11.18](https://github.com/cube-js/cube.js/compare/v0.11.17...v0.11.18) (2019-11-09)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-## [0.20.9](https://github.com/cube-js/cube.js/compare/v0.20.8...v0.20.9) (2020-09-19)
+## [0.11.10](https://github.com/statsbotco/cubejs-client/compare/v0.11.9...v0.11.10) (2019-10-25)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.11.9](https://github.com/statsbotco/cubejs-client/compare/v0.11.8...v0.11.9) (2019-10-23)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
+## [0.11.7](https://github.com/statsbotco/cubejs-client/compare/v0.11.6...v0.11.7) (2019-10-22)
 
+**Note:** Version bump only for package @cubejs-client/ngx
 
-## [0.20.6](https://github.com/cube-js/cube.js/compare/v0.20.5...v0.20.6) (2020-09-10)
+## [0.11.2](https://github.com/statsbotco/cubejs-client/compare/v0.11.1...v0.11.2) (2019-10-15)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
-## [0.20.5](https://github.com/cube-js/cube.js/compare/v0.20.4...v0.20.5) (2020-09-10)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.20.3](https://github.com/cube-js/cube.js/compare/v0.20.2...v0.20.3) (2020-09-03)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.20.2](https://github.com/cube-js/cube.js/compare/v0.20.1...v0.20.2) (2020-09-02)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.20.1](https://github.com/cube-js/cube.js/compare/v0.20.0...v0.20.1) (2020-09-01)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-# [0.20.0](https://github.com/cube-js/cube.js/compare/v0.19.61...v0.20.0) (2020-08-26)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.56](https://github.com/cube-js/cube.js/compare/v0.19.55...v0.19.56) (2020-08-03)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.55](https://github.com/cube-js/cube.js/compare/v0.19.54...v0.19.55) (2020-07-23)
-
-
-### Bug Fixes
-
-* ngx client installation ([#898](https://github.com/cube-js/cube.js/issues/898)) ([31ab9a0](https://github.com/cube-js/cube.js/commit/31ab9a0))
-
-
-
-
-
-## [0.19.54](https://github.com/cube-js/cube.js/compare/v0.19.53...v0.19.54) (2020-07-23)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.53](https://github.com/cube-js/cube.js/compare/v0.19.52...v0.19.53) (2020-07-20)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.51](https://github.com/cube-js/cube.js/compare/v0.19.50...v0.19.51) (2020-07-17)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.50](https://github.com/cube-js/cube.js/compare/v0.19.49...v0.19.50) (2020-07-16)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.48](https://github.com/cube-js/cube.js/compare/v0.19.47...v0.19.48) (2020-07-11)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.43](https://github.com/cube-js/cube.js/compare/v0.19.42...v0.19.43) (2020-07-04)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.42](https://github.com/cube-js/cube.js/compare/v0.19.41...v0.19.42) (2020-07-01)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.41](https://github.com/cube-js/cube.js/compare/v0.19.40...v0.19.41) (2020-06-30)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.40](https://github.com/cube-js/cube.js/compare/v0.19.39...v0.19.40) (2020-06-30)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.37](https://github.com/cube-js/cube.js/compare/v0.19.36...v0.19.37) (2020-06-26)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.35](https://github.com/cube-js/cube.js/compare/v0.19.34...v0.19.35) (2020-06-22)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.31](https://github.com/cube-js/cube.js/compare/v0.19.30...v0.19.31) (2020-06-10)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.23](https://github.com/cube-js/cube.js/compare/v0.19.22...v0.19.23) (2020-06-02)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.22](https://github.com/cube-js/cube.js/compare/v0.19.21...v0.19.22) (2020-05-26)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.19](https://github.com/cube-js/cube.js/compare/v0.19.18...v0.19.19) (2020-05-15)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.16](https://github.com/cube-js/cube.js/compare/v0.19.15...v0.19.16) (2020-05-07)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.14](https://github.com/cube-js/cube.js/compare/v0.19.13...v0.19.14) (2020-04-24)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.13](https://github.com/cube-js/cube.js/compare/v0.19.12...v0.19.13) (2020-04-21)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.12](https://github.com/cube-js/cube.js/compare/v0.19.11...v0.19.12) (2020-04-20)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.9](https://github.com/cube-js/cube.js/compare/v0.19.8...v0.19.9) (2020-04-16)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.19.7](https://github.com/cube-js/cube.js/compare/v0.19.6...v0.19.7) (2020-04-14)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-# [0.19.0](https://github.com/cube-js/cube.js/compare/v0.18.32...v0.19.0) (2020-04-09)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.18.18](https://github.com/cube-js/cube.js/compare/v0.18.17...v0.18.18) (2020-03-28)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.18.7](https://github.com/cube-js/cube.js/compare/v0.18.6...v0.18.7) (2020-03-17)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.18.6](https://github.com/cube-js/cube.js/compare/v0.18.5...v0.18.6) (2020-03-16)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.18.5](https://github.com/cube-js/cube.js/compare/v0.18.4...v0.18.5) (2020-03-15)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.18.4](https://github.com/cube-js/cube.js/compare/v0.18.3...v0.18.4) (2020-03-09)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-# [0.18.0](https://github.com/cube-js/cube.js/compare/v0.17.10...v0.18.0) (2020-03-01)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.17.10](https://github.com/cube-js/cube.js/compare/v0.17.9...v0.17.10) (2020-02-20)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.17.9](https://github.com/cube-js/cube.js/compare/v0.17.8...v0.17.9) (2020-02-18)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.17.8](https://github.com/cube-js/cube.js/compare/v0.17.7...v0.17.8) (2020-02-14)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-# [0.17.0](https://github.com/cube-js/cube.js/compare/v0.16.0...v0.17.0) (2020-02-04)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-# [0.16.0](https://github.com/cube-js/cube.js/compare/v0.15.4...v0.16.0) (2020-02-04)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.15.4](https://github.com/cube-js/cube.js/compare/v0.15.3...v0.15.4) (2020-02-02)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.15.2](https://github.com/cube-js/cube.js/compare/v0.15.1...v0.15.2) (2020-01-25)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-# [0.15.0](https://github.com/cube-js/cube.js/compare/v0.14.3...v0.15.0) (2020-01-18)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-# [0.14.0](https://github.com/cube-js/cube.js/compare/v0.13.12...v0.14.0) (2020-01-16)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.13.12](https://github.com/cube-js/cube.js/compare/v0.13.11...v0.13.12) (2020-01-12)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.13.9](https://github.com/cube-js/cube.js/compare/v0.13.8...v0.13.9) (2020-01-03)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.13.7](https://github.com/cube-js/cube.js/compare/v0.13.6...v0.13.7) (2019-12-31)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.13.5](https://github.com/cube-js/cube.js/compare/v0.13.4...v0.13.5) (2019-12-17)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-# [0.13.0](https://github.com/cube-js/cube.js/compare/v0.12.3...v0.13.0) (2019-12-10)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-# [0.12.0](https://github.com/cube-js/cube.js/compare/v0.11.25...v0.12.0) (2019-11-25)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.11.18](https://github.com/cube-js/cube.js/compare/v0.11.17...v0.11.18) (2019-11-09)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.11.10](https://github.com/statsbotco/cubejs-client/compare/v0.11.9...v0.11.10) (2019-10-25)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.11.9](https://github.com/statsbotco/cubejs-client/compare/v0.11.8...v0.11.9) (2019-10-23)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.11.7](https://github.com/statsbotco/cubejs-client/compare/v0.11.6...v0.11.7) (2019-10-22)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-## [0.11.2](https://github.com/statsbotco/cubejs-client/compare/v0.11.1...v0.11.2) (2019-10-15)
-
-**Note:** Version bump only for package @cubejs-client/ngx
-
-
-
-
-
-# [0.11.0](https://github.com/statsbotco/cubejs-client/compare/v0.10.62...v0.11.0) (2019-10-15)
+# [0.11.0](https://github.com/statsbotco/cubejs-client/compare/v0.10.62...v0.11.0) (2019-10-15)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 ## [0.10.61](https://github.com/statsbotco/cubejs-client/compare/v0.10.60...v0.10.61) (2019-10-10)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 ## [0.10.60](https://github.com/statsbotco/cubejs-client/compare/v0.10.59...v0.10.60) (2019-10-08)
 
-
 ### Bug Fixes
 
-* **client-ngx:** Support Observables for config: runtime token change case ([0e30773](https://github.com/statsbotco/cubejs-client/commit/0e30773))
-
-
-
-
+- **client-ngx:** Support Observables for config: runtime token change case ([0e30773](https://github.com/statsbotco/cubejs-client/commit/0e30773))
 
 ## [0.10.59](https://github.com/statsbotco/cubejs-client/compare/v0.10.58...v0.10.59) (2019-10-08)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 ## [0.10.56](https://github.com/statsbotco/cubejs-client/compare/v0.10.55...v0.10.56) (2019-10-04)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 ## [0.10.55](https://github.com/statsbotco/cubejs-client/compare/v0.10.54...v0.10.55) (2019-10-03)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 ## [0.10.52](https://github.com/statsbotco/cubejs-client/compare/v0.10.51...v0.10.52) (2019-10-01)
 
-
 ### Bug Fixes
 
-* **client-ngx:** client.ts is missing from the TypeScript compilation. Fix files ([f4885b4](https://github.com/statsbotco/cubejs-client/commit/f4885b4))
-
-
-
-
+- **client-ngx:** client.ts is missing from the TypeScript compilation. Fix files ([f4885b4](https://github.com/statsbotco/cubejs-client/commit/f4885b4))
 
 ## [0.10.51](https://github.com/statsbotco/cubejs-client/compare/v0.10.50...v0.10.51) (2019-10-01)
 
-
 ### Bug Fixes
 
-* **client-ngx:** client.ts is missing from the TypeScript compilation. Fix files ([8fe80f6](https://github.com/statsbotco/cubejs-client/commit/8fe80f6))
-
-
-
-
+- **client-ngx:** client.ts is missing from the TypeScript compilation. Fix files ([8fe80f6](https://github.com/statsbotco/cubejs-client/commit/8fe80f6))
 
 ## [0.10.50](https://github.com/statsbotco/cubejs-client/compare/v0.10.49...v0.10.50) (2019-10-01)
 
-
 ### Bug Fixes
 
-* **client-ngx:** client.ts is missing from the TypeScript compilation. Fix files ([ae5c2df](https://github.com/statsbotco/cubejs-client/commit/ae5c2df))
-
-
-
-
+- **client-ngx:** client.ts is missing from the TypeScript compilation. Fix files ([ae5c2df](https://github.com/statsbotco/cubejs-client/commit/ae5c2df))
 
 ## [0.10.49](https://github.com/statsbotco/cubejs-client/compare/v0.10.48...v0.10.49) (2019-10-01)
 
-
 ### Bug Fixes
 
-* **client-ngx:** client.ts is missing from the TypeScript compilation ([65a30cf](https://github.com/statsbotco/cubejs-client/commit/65a30cf))
-
-
-
-
+- **client-ngx:** client.ts is missing from the TypeScript compilation ([65a30cf](https://github.com/statsbotco/cubejs-client/commit/65a30cf))
 
 ## [0.10.48](https://github.com/statsbotco/cubejs-client/compare/v0.10.47...v0.10.48) (2019-10-01)
 
-
 ### Bug Fixes
 
-* **client-ngx:** client.ts is missing from the TypeScript compilation ([ffab1a1](https://github.com/statsbotco/cubejs-client/commit/ffab1a1))
-
-
-
-
+- **client-ngx:** client.ts is missing from the TypeScript compilation ([ffab1a1](https://github.com/statsbotco/cubejs-client/commit/ffab1a1))
 
 ## [0.10.47](https://github.com/statsbotco/cubejs-client/compare/v0.10.46...v0.10.47) (2019-10-01)
 
-
 ### Bug Fixes
 
-* **client-ngx:** client.ts is missing from the TypeScript compilation ([7dfc071](https://github.com/statsbotco/cubejs-client/commit/7dfc071))
-
-
-
-
+- **client-ngx:** client.ts is missing from the TypeScript compilation ([7dfc071](https://github.com/statsbotco/cubejs-client/commit/7dfc071))
 
 ## [0.10.43](https://github.com/statsbotco/cubejs-client/compare/v0.10.42...v0.10.43) (2019-09-27)
 
-
 ### Features
 
-* Dynamic dashboards ([#218](https://github.com/statsbotco/cubejs-client/issues/218)) ([2c6cdc9](https://github.com/statsbotco/cubejs-client/commit/2c6cdc9))
-
-
-
-
+- Dynamic dashboards ([#218](https://github.com/statsbotco/cubejs-client/issues/218)) ([2c6cdc9](https://github.com/statsbotco/cubejs-client/commit/2c6cdc9))
 
 ## [0.10.42](https://github.com/statsbotco/cubejs-client/compare/v0.10.41...v0.10.42) (2019-09-16)
 
-
 ### Bug Fixes
 
-* **client-ngx:** Function calls are not supported in decorators but 'ɵangular_packages_core_core_a' was called. ([65871f9](https://github.com/statsbotco/cubejs-client/commit/65871f9))
-
-
-
-
+- **client-ngx:** Function calls are not supported in decorators but 'ɵangular_packages_core_core_a' was called. ([65871f9](https://github.com/statsbotco/cubejs-client/commit/65871f9))
 
 ## [0.10.40](https://github.com/statsbotco/cubejs-client/compare/v0.10.39...v0.10.40) (2019-09-09)
 
-
 ### Bug Fixes
 
-* missed Vue.js build ([1cf22d5](https://github.com/statsbotco/cubejs-client/commit/1cf22d5))
-
-
-
-
+- missed Vue.js build ([1cf22d5](https://github.com/statsbotco/cubejs-client/commit/1cf22d5))
 
 ## [0.10.37](https://github.com/statsbotco/cubejs-client/compare/v0.10.36...v0.10.37) (2019-09-09)
 
-
 ### Bug Fixes
 
-* **client-ngx:** Omit warnings for Angular import: Use cjs module as main ([97e8d48](https://github.com/statsbotco/cubejs-client/commit/97e8d48))
-
-
-
-
+- **client-ngx:** Omit warnings for Angular import: Use cjs module as main ([97e8d48](https://github.com/statsbotco/cubejs-client/commit/97e8d48))
 
 ## [0.10.15](https://github.com/statsbotco/cubejs-client/compare/v0.10.14...v0.10.15) (2019-07-13)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 ## [0.10.14](https://github.com/statsbotco/cubejs-client/compare/v0.10.13...v0.10.14) (2019-07-13)
 
-
 ### Features
 
-* **playground:** Show Query ([dc45fcb](https://github.com/statsbotco/cubejs-client/commit/dc45fcb))
-
-
-
-
+- **playground:** Show Query ([dc45fcb](https://github.com/statsbotco/cubejs-client/commit/dc45fcb))
 
 # [0.10.0](https://github.com/statsbotco/cubejs-client/compare/v0.9.24...v0.10.0) (2019-06-21)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 ## [0.9.11](https://github.com/statsbotco/cubejs-client/compare/v0.9.10...v0.9.11) (2019-05-31)
 
-
 ### Bug Fixes
 
-* **client-core:** ResultSet series returns a series with no data ([715e170](https://github.com/statsbotco/cubejs-client/commit/715e170)), closes [#38](https://github.com/statsbotco/cubejs-client/issues/38)
-
-
-
-
+- **client-core:** ResultSet series returns a series with no data ([715e170](https://github.com/statsbotco/cubejs-client/commit/715e170)), closes [#38](https://github.com/statsbotco/cubejs-client/issues/38)
 
 # [0.9.0](https://github.com/statsbotco/cubejs-client/compare/v0.8.7...v0.9.0) (2019-05-11)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 ## [0.8.7](https://github.com/statsbotco/cubejs-client/compare/v0.8.6...v0.8.7) (2019-05-09)
 
 **Note:** Version bump only for package @cubejs-client/ngx
 
-
-
-
-
 ## [0.8.4](https://github.com/statsbotco/cubejs-client/compare/v0.8.3...v0.8.4) (2019-05-02)
 
-
 ### Features
 
-* Angular client ([#99](https://github.com/statsbotco/cubejs-client/issues/99)) ([640e6de](https://github.com/statsbotco/cubejs-client/commit/640e6de))
+- Angular client ([#99](https://github.com/statsbotco/cubejs-client/issues/99)) ([640e6de](https://github.com/statsbotco/cubejs-client/commit/640e6de))
diff --git a/packages/cubejs-client-ngx/README.md b/packages/cubejs-client-ngx/README.md
index 762375ca92..33198b9fd2 100644
--- a/packages/cubejs-client-ngx/README.md
+++ b/packages/cubejs-client-ngx/README.md
@@ -2,7 +2,7 @@
 
 [Website](https://cube.dev) • [Docs](https://cube.dev/docs) • [Blog](https://cube.dev/blog) • [Slack](https://slack.cube.dev) • [Twitter](https://twitter.com/the_cube_dev)
 
-[![npm version](https://badge.fury.io/js/%40cubejs-backend%2Fserver.svg)](https://badge.fury.io/js/%40cubejs-backend%2Fserver)
+[![npm version](https://badge.fury.io/js/%40cubejs-client%2Fngx.svg)](https://badge.fury.io/js/%40cubejs-client%2Fngx)
 [![GitHub Actions](https://github.com/cube-js/cube.js/workflows/Build/badge.svg)](https://github.com/cube-js/cube.js/actions?query=workflow%3ABuild+branch%3Amaster)
 
 # Cube.js Angular Client
diff --git a/packages/cubejs-client-ngx/package.json b/packages/cubejs-client-ngx/package.json
index e1adb69091..b77c23f8ae 100644
--- a/packages/cubejs-client-ngx/package.json
+++ b/packages/cubejs-client-ngx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/ngx",
-  "version": "1.1.12",
+  "version": "1.2.14",
   "author": "Cube Dev, Inc.",
   "engines": {},
   "repository": {
@@ -9,9 +9,16 @@
     "directory": "packages/cubejs-client-ngx"
   },
   "description": "Cube.js client for Angular",
-  "files": [
-    "dist"
-  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "lerna": {
+    "command": {
+      "publish": {
+        "directory": "dist"
+      }
+    }
+  },
   "license": "MIT",
   "scripts": {
     "build": "ng build",
diff --git a/packages/cubejs-client-react/CHANGELOG.md b/packages/cubejs-client-react/CHANGELOG.md
index d9817b8331..509210e8f7 100644
--- a/packages/cubejs-client-react/CHANGELOG.md
+++ b/packages/cubejs-client-react/CHANGELOG.md
@@ -3,2204 +3,1229 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.1.16](https://github.com/cube-js/cube/compare/v1.1.15...v1.1.16) (2025-01-22)
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-### Bug Fixes
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
 
-* **cubejs-client-react:** useCubeQuery initial loading state ([#9117](https://github.com/cube-js/cube/issues/9117)) ([81f9b58](https://github.com/cube-js/cube/commit/81f9b58c88a966e459fc15105a9f2d191a18bf22))
+**Note:** Version bump only for package @cubejs-client/react
 
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [1.1.12](https://github.com/cube-js/cube/compare/v1.1.11...v1.1.12) (2025-01-09)
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-# [1.0.0](https://github.com/cube-js/cube/compare/v0.36.11...v1.0.0) (2024-10-15)
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.36.4](https://github.com/cube-js/cube/compare/v0.36.3...v0.36.4) (2024-09-27)
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.36.2](https://github.com/cube-js/cube/compare/v0.36.1...v0.36.2) (2024-09-18)
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [1.1.16](https://github.com/cube-js/cube/compare/v1.1.15...v1.1.16) (2025-01-22)
 
+### Bug Fixes
 
-# [0.36.0](https://github.com/cube-js/cube/compare/v0.35.81...v0.36.0) (2024-09-13)
+- **cubejs-client-react:** useCubeQuery initial loading state ([#9117](https://github.com/cube-js/cube/issues/9117)) ([81f9b58](https://github.com/cube-js/cube/commit/81f9b58c88a966e459fc15105a9f2d191a18bf22))
 
-**Note:** Version bump only for package @cubejs-client/react
+## [1.1.12](https://github.com/cube-js/cube/compare/v1.1.11...v1.1.12) (2025-01-09)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+# [1.0.0](https://github.com/cube-js/cube/compare/v0.36.11...v1.0.0) (2024-10-15)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.36.4](https://github.com/cube-js/cube/compare/v0.36.3...v0.36.4) (2024-09-27)
 
-## [0.35.48](https://github.com/cube-js/cube/compare/v0.35.47...v0.35.48) (2024-06-14)
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.36.2](https://github.com/cube-js/cube/compare/v0.36.1...v0.36.2) (2024-09-18)
 
-### Bug Fixes
+**Note:** Version bump only for package @cubejs-client/react
 
-* **client-react:** udpate td with a compare date range ([#8339](https://github.com/cube-js/cube/issues/8339)) ([9ef51f7](https://github.com/cube-js/cube/commit/9ef51f7b12c624873bfa79a302038db7e4b47a6a))
+# [0.36.0](https://github.com/cube-js/cube/compare/v0.35.81...v0.36.0) (2024-09-13)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.35.48](https://github.com/cube-js/cube/compare/v0.35.47...v0.35.48) (2024-06-14)
 
+### Bug Fixes
 
+- **client-react:** udpate td with a compare date range ([#8339](https://github.com/cube-js/cube/issues/8339)) ([9ef51f7](https://github.com/cube-js/cube/commit/9ef51f7b12c624873bfa79a302038db7e4b47a6a))
 
 ## [0.35.23](https://github.com/cube-js/cube/compare/v0.35.22...v0.35.23) (2024-04-25)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
 # [0.35.0](https://github.com/cube-js/cube/compare/v0.34.62...v0.35.0) (2024-03-14)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
 ## [0.34.60](https://github.com/cube-js/cube/compare/v0.34.59...v0.34.60) (2024-03-02)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
 ## [0.34.46](https://github.com/cube-js/cube/compare/v0.34.45...v0.34.46) (2024-01-18)
 
-
 ### Bug Fixes
 
-* **cubejs-client/react:** types for useCubeQuery ([#7668](https://github.com/cube-js/cube/issues/7668)) Thanks [@tchell](https://github.com/tchell) ! ([2f95f76](https://github.com/cube-js/cube/commit/2f95f76031e4419998bd2001c10d78ec4b75ef2e))
-
-
-
-
+- **cubejs-client/react:** types for useCubeQuery ([#7668](https://github.com/cube-js/cube/issues/7668)) Thanks [@tchell](https://github.com/tchell) ! ([2f95f76](https://github.com/cube-js/cube/commit/2f95f76031e4419998bd2001c10d78ec4b75ef2e))
 
 ## [0.34.37](https://github.com/cube-js/cube/compare/v0.34.36...v0.34.37) (2023-12-19)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.34.32](https://github.com/cube-js/cube/compare/v0.34.31...v0.34.32) (2023-12-07)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.34.27](https://github.com/cube-js/cube/compare/v0.34.26...v0.34.27) (2023-11-30)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.34.32](https://github.com/cube-js/cube/compare/v0.34.31...v0.34.32) (2023-12-07)
+## [0.34.24](https://github.com/cube-js/cube/compare/v0.34.23...v0.34.24) (2023-11-23)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.34.19](https://github.com/cube-js/cube/compare/v0.34.18...v0.34.19) (2023-11-11)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.34.9](https://github.com/cube-js/cube/compare/v0.34.8...v0.34.9) (2023-10-26)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.34.27](https://github.com/cube-js/cube/compare/v0.34.26...v0.34.27) (2023-11-30)
+## [0.34.2](https://github.com/cube-js/cube/compare/v0.34.1...v0.34.2) (2023-10-12)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+# [0.34.0](https://github.com/cube-js/cube/compare/v0.33.65...v0.34.0) (2023-10-03)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.33.59](https://github.com/cube-js/cube/compare/v0.33.58...v0.33.59) (2023-09-20)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.34.24](https://github.com/cube-js/cube/compare/v0.34.23...v0.34.24) (2023-11-23)
+## [0.33.58](https://github.com/cube-js/cube/compare/v0.33.57...v0.33.58) (2023-09-18)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.33.55](https://github.com/cube-js/cube/compare/v0.33.54...v0.33.55) (2023-09-12)
 
+### Features
 
+- **client-core:** castNumerics option ([#7123](https://github.com/cube-js/cube/issues/7123)) ([9aed9ac](https://github.com/cube-js/cube/commit/9aed9ac2c271d064888db6f3fe726dac350b52ea))
 
-
-## [0.34.19](https://github.com/cube-js/cube/compare/v0.34.18...v0.34.19) (2023-11-11)
+## [0.33.47](https://github.com/cube-js/cube/compare/v0.33.46...v0.33.47) (2023-08-15)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.33.44](https://github.com/cube-js/cube/compare/v0.33.43...v0.33.44) (2023-08-11)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.33.12](https://github.com/cube-js/cube/compare/v0.33.11...v0.33.12) (2023-05-22)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.34.9](https://github.com/cube-js/cube/compare/v0.34.8...v0.34.9) (2023-10-26)
+# [0.33.0](https://github.com/cube-js/cube/compare/v0.32.31...v0.33.0) (2023-05-02)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.32.30](https://github.com/cube-js/cube/compare/v0.32.29...v0.32.30) (2023-04-28)
 
+### Features
 
+- **playground:** cube type tag, public cubes ([#6482](https://github.com/cube-js/cube/issues/6482)) ([cede7a7](https://github.com/cube-js/cube/commit/cede7a71f7d2e8d9dc221669b6b1714ee146d8ea))
 
-
-## [0.34.2](https://github.com/cube-js/cube/compare/v0.34.1...v0.34.2) (2023-10-12)
+## [0.32.22](https://github.com/cube-js/cube/compare/v0.32.21...v0.32.22) (2023-04-10)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.32.17](https://github.com/cube-js/cube/compare/v0.32.16...v0.32.17) (2023-03-29)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.32.12](https://github.com/cube-js/cube/compare/v0.32.11...v0.32.12) (2023-03-22)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-# [0.34.0](https://github.com/cube-js/cube/compare/v0.33.65...v0.34.0) (2023-10-03)
+# [0.32.0](https://github.com/cube-js/cube.js/compare/v0.31.69...v0.32.0) (2023-03-02)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.31.63](https://github.com/cube-js/cube.js/compare/v0.31.62...v0.31.63) (2023-02-20)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.31.46](https://github.com/cube-js/cube.js/compare/v0.31.45...v0.31.46) (2023-01-18)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.33.59](https://github.com/cube-js/cube/compare/v0.33.58...v0.33.59) (2023-09-20)
+## [0.31.35](https://github.com/cube-js/cube.js/compare/v0.31.34...v0.31.35) (2023-01-07)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.31.34](https://github.com/cube-js/cube.js/compare/v0.31.33...v0.31.34) (2023-01-05)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.31.33](https://github.com/cube-js/cube.js/compare/v0.31.32...v0.31.33) (2023-01-03)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.33.58](https://github.com/cube-js/cube/compare/v0.33.57...v0.33.58) (2023-09-18)
+## [0.31.30](https://github.com/cube-js/cube.js/compare/v0.31.29...v0.31.30) (2022-12-22)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.31.15](https://github.com/cube-js/cube.js/compare/v0.31.14...v0.31.15) (2022-11-17)
 
+### Bug Fixes
 
+- **client-react:** check meta changes ([4c44551](https://github.com/cube-js/cube.js/commit/4c44551b880bd4ff34d443241c1c0c28cae0d5f8))
+- packages/cubejs-client-react/package.json to reduce vulnerabilities ([#5390](https://github.com/cube-js/cube.js/issues/5390)) ([0ab9c30](https://github.com/cube-js/cube.js/commit/0ab9c30692c70d3776a8429197915090fef61d4f))
 
+## [0.31.14](https://github.com/cube-js/cube.js/compare/v0.31.13...v0.31.14) (2022-11-14)
 
-## [0.33.55](https://github.com/cube-js/cube/compare/v0.33.54...v0.33.55) (2023-09-12)
+### Bug Fixes
 
+- **playground:** schemaVersion updates ([5c4880f](https://github.com/cube-js/cube.js/commit/5c4880f1fa30189798c0b0ea42df67c7fd0aea75))
 
 ### Features
 
-* **client-core:** castNumerics option ([#7123](https://github.com/cube-js/cube/issues/7123)) ([9aed9ac](https://github.com/cube-js/cube/commit/9aed9ac2c271d064888db6f3fe726dac350b52ea))
+- **playground:** ability to rerun queries ([#5597](https://github.com/cube-js/cube.js/issues/5597)) ([6ef8ce9](https://github.com/cube-js/cube.js/commit/6ef8ce91740086dc0b10ea11d7133f8be1e2ef0a))
 
+## [0.31.13](https://github.com/cube-js/cube.js/compare/v0.31.12...v0.31.13) (2022-11-08)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.31.9](https://github.com/cube-js/cube.js/compare/v0.31.8...v0.31.9) (2022-11-01)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.33.47](https://github.com/cube-js/cube/compare/v0.33.46...v0.33.47) (2023-08-15)
+## [0.31.8](https://github.com/cube-js/cube.js/compare/v0.31.7...v0.31.8) (2022-10-30)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+# [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.30.74](https://github.com/cube-js/cube.js/compare/v0.30.73...v0.30.74) (2022-09-20)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.33.44](https://github.com/cube-js/cube/compare/v0.33.43...v0.33.44) (2023-08-11)
+## [0.30.69](https://github.com/cube-js/cube.js/compare/v0.30.68...v0.30.69) (2022-09-13)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.30.64](https://github.com/cube-js/cube.js/compare/v0.30.63...v0.30.64) (2022-09-07)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.30.60](https://github.com/cube-js/cube.js/compare/v0.30.59...v0.30.60) (2022-08-28)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.33.12](https://github.com/cube-js/cube/compare/v0.33.11...v0.33.12) (2023-05-22)
+## [0.30.46](https://github.com/cube-js/cube.js/compare/v0.30.45...v0.30.46) (2022-08-10)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.30.40](https://github.com/cube-js/cube.js/compare/v0.30.39...v0.30.40) (2022-07-26)
+
+### Bug Fixes
+
+- **client-react:** update hooks for React 18 StrictMode ([#4999](https://github.com/cube-js/cube.js/issues/4999)) ([fd6352c](https://github.com/cube-js/cube.js/commit/fd6352c61a614afef61b2a9d4332ecf300594b3b))
 
+## [0.30.30](https://github.com/cube-js/cube.js/compare/v0.30.29...v0.30.30) (2022-07-05)
 
+### Bug Fixes
 
+- **client-react:** useIsMounted hook compatible with React 18 StrictMode ([#4740](https://github.com/cube-js/cube.js/issues/4740)) ([aa7d3a4](https://github.com/cube-js/cube.js/commit/aa7d3a4788d38027f59c77bd567270a98a43b689))
 
-# [0.33.0](https://github.com/cube-js/cube/compare/v0.32.31...v0.33.0) (2023-05-02)
+## [0.30.29](https://github.com/cube-js/cube.js/compare/v0.30.28...v0.30.29) (2022-07-01)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.30.4](https://github.com/cube-js/cube.js/compare/v0.30.3...v0.30.4) (2022-05-20)
 
+### Bug Fixes
 
+- **playground:** Remove all time time dimension without granularity ([#4564](https://github.com/cube-js/cube.js/issues/4564)) ([054f488](https://github.com/cube-js/cube.js/commit/054f488ce6b8bfa103cd435f99178ca1f2fa38c7))
 
+# [0.30.0](https://github.com/cube-js/cube.js/compare/v0.29.57...v0.30.0) (2022-05-11)
 
-## [0.32.30](https://github.com/cube-js/cube/compare/v0.32.29...v0.32.30) (2023-04-28)
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.29.54](https://github.com/cube-js/cube.js/compare/v0.29.53...v0.29.54) (2022-05-03)
 
 ### Features
 
-* **playground:** cube type tag, public cubes ([#6482](https://github.com/cube-js/cube/issues/6482)) ([cede7a7](https://github.com/cube-js/cube/commit/cede7a71f7d2e8d9dc221669b6b1714ee146d8ea))
-
+- Detailed client TS types ([#4446](https://github.com/cube-js/cube.js/issues/4446)) Thanks [@reify-thomas-smith](https://github.com/reify-thomas-smith) ! ([977cce0](https://github.com/cube-js/cube.js/commit/977cce0c440bc73c0e6b5ad0c10af926b7386873)), closes [#4202](https://github.com/cube-js/cube.js/issues/4202)
 
+## [0.29.53](https://github.com/cube-js/cube.js/compare/v0.29.52...v0.29.53) (2022-04-29)
 
+### Features
 
+- **@cubejs-client/core:** Accept immutable queries ([#4366](https://github.com/cube-js/cube.js/issues/4366)) Thanks [@reify-thomas-smith](https://github.com/reify-thomas-smith)! ([19b1514](https://github.com/cube-js/cube.js/commit/19b1514d75cc47e0f081dd02e8de0a34aed118bb)), closes [#4160](https://github.com/cube-js/cube.js/issues/4160)
+- **playground:** display error stack traces ([#4438](https://github.com/cube-js/cube.js/issues/4438)) ([0932cda](https://github.com/cube-js/cube.js/commit/0932cdad2a66caefd29d648ab63dd72f91239438))
 
-## [0.32.22](https://github.com/cube-js/cube/compare/v0.32.21...v0.32.22) (2023-04-10)
+## [0.29.51](https://github.com/cube-js/cube.js/compare/v0.29.50...v0.29.51) (2022-04-22)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.29.48](https://github.com/cube-js/cube.js/compare/v0.29.47...v0.29.48) (2022-04-14)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.29.43](https://github.com/cube-js/cube.js/compare/v0.29.42...v0.29.43) (2022-04-07)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.32.17](https://github.com/cube-js/cube/compare/v0.32.16...v0.32.17) (2023-03-29)
+## [0.29.42](https://github.com/cube-js/cube.js/compare/v0.29.41...v0.29.42) (2022-04-04)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.29.33](https://github.com/cube-js/cube.js/compare/v0.29.32...v0.29.33) (2022-03-17)
+
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.29.29](https://github.com/cube-js/cube.js/compare/v0.29.28...v0.29.29) (2022-03-03)
 
+### Bug Fixes
 
+- **playground:** prevent params to shift around when removing filters ([e3d17ae](https://github.com/cube-js/cube.js/commit/e3d17ae7b2b8340ee39ea6464773b2676dc5a9f6))
 
-## [0.32.12](https://github.com/cube-js/cube/compare/v0.32.11...v0.32.12) (2023-03-22)
+## [0.29.24](https://github.com/cube-js/cube.js/compare/v0.29.23...v0.29.24) (2022-02-01)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.29.23](https://github.com/cube-js/cube.js/compare/v0.29.22...v0.29.23) (2022-01-26)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.29.8](https://github.com/cube-js/cube.js/compare/v0.29.7...v0.29.8) (2021-12-21)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-# [0.32.0](https://github.com/cube-js/cube.js/compare/v0.31.69...v0.32.0) (2023-03-02)
+## [0.29.5](https://github.com/cube-js/cube.js/compare/v0.29.4...v0.29.5) (2021-12-17)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+# [0.29.0](https://github.com/cube-js/cube.js/compare/v0.28.67...v0.29.0) (2021-12-14)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.28.52](https://github.com/cube-js/cube.js/compare/v0.28.51...v0.28.52) (2021-11-03)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.31.63](https://github.com/cube-js/cube.js/compare/v0.31.62...v0.31.63) (2023-02-20)
+## [0.28.45](https://github.com/cube-js/cube.js/compare/v0.28.44...v0.28.45) (2021-10-19)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.28.38](https://github.com/cube-js/cube.js/compare/v0.28.37...v0.28.38) (2021-09-20)
 
+### Features
 
+- **playground:** time zone for cron expressions ([#3441](https://github.com/cube-js/cube.js/issues/3441)) ([b27f509](https://github.com/cube-js/cube.js/commit/b27f509c690c7970ea5443650a141a1bbfcc947b))
 
+## [0.28.37](https://github.com/cube-js/cube.js/compare/v0.28.36...v0.28.37) (2021-09-17)
 
-## [0.31.46](https://github.com/cube-js/cube.js/compare/v0.31.45...v0.31.46) (2023-01-18)
-
-**Note:** Version bump only for package @cubejs-client/react
+### Features
 
+- **playground:** add rollup button ([#3424](https://github.com/cube-js/cube.js/issues/3424)) ([a5db7f1](https://github.com/cube-js/cube.js/commit/a5db7f1905d1eb50bb6e78b4c6c54e03ba7499c9))
 
+## [0.28.36](https://github.com/cube-js/cube.js/compare/v0.28.35...v0.28.36) (2021-09-14)
 
+### Features
 
+- **@cubejs-client/react:** useCubeMeta hook ([#3050](https://github.com/cube-js/cube.js/issues/3050)) ([e86b3fa](https://github.com/cube-js/cube.js/commit/e86b3fab76f1fa947262c1a54b18f5c7143f0306))
 
-## [0.31.35](https://github.com/cube-js/cube.js/compare/v0.31.34...v0.31.35) (2023-01-07)
+## [0.28.35](https://github.com/cube-js/cube.js/compare/v0.28.34...v0.28.35) (2021-09-13)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.28.33](https://github.com/cube-js/cube.js/compare/v0.28.32...v0.28.33) (2021-09-11)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-
-
-## [0.31.34](https://github.com/cube-js/cube.js/compare/v0.31.33...v0.31.34) (2023-01-05)
+## [0.28.25](https://github.com/cube-js/cube.js/compare/v0.28.24...v0.28.25) (2021-08-20)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.28.24](https://github.com/cube-js/cube.js/compare/v0.28.23...v0.28.24) (2021-08-19)
 
+### Features
 
+- Added Quarter to the timeDimensions of ([3f62b2c](https://github.com/cube-js/cube.js/commit/3f62b2c125b2b7b752e370b65be4c89a0c65a623))
 
-
-## [0.31.33](https://github.com/cube-js/cube.js/compare/v0.31.32...v0.31.33) (2023-01-03)
+## [0.28.17](https://github.com/cube-js/cube.js/compare/v0.28.16...v0.28.17) (2021-08-11)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.28.15](https://github.com/cube-js/cube.js/compare/v0.28.14...v0.28.15) (2021-08-06)
 
+### Bug Fixes
 
+- **@cubejs-client/core:** do not filter out time dimensions ([#3201](https://github.com/cube-js/cube.js/issues/3201)) ([0300093](https://github.com/cube-js/cube.js/commit/0300093e0af29b87e7a9018dc8159c1299e3cd85))
 
-
-## [0.31.30](https://github.com/cube-js/cube.js/compare/v0.31.29...v0.31.30) (2022-12-22)
+## [0.28.10](https://github.com/cube-js/cube.js/compare/v0.28.9...v0.28.10) (2021-07-30)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.28.9](https://github.com/cube-js/cube.js/compare/v0.28.8...v0.28.9) (2021-07-29)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.28.7](https://github.com/cube-js/cube.js/compare/v0.28.6...v0.28.7) (2021-07-25)
 
+### Bug Fixes
 
-## [0.31.15](https://github.com/cube-js/cube.js/compare/v0.31.14...v0.31.15) (2022-11-17)
-
+- **@cubejs-client/react:** QueryBuilder incorrectly deduplicates filters based only on member instead of member+operator ([#2948](https://github.com/cube-js/cube.js/issues/2948)) ([#3147](https://github.com/cube-js/cube.js/issues/3147)) ([69d5baf](https://github.com/cube-js/cube.js/commit/69d5baf761bf6a55ec487cb179c61878bbfa6089))
 
-### Bug Fixes
+## [0.28.6](https://github.com/cube-js/cube.js/compare/v0.28.5...v0.28.6) (2021-07-22)
 
-* **client-react:** check meta changes ([4c44551](https://github.com/cube-js/cube.js/commit/4c44551b880bd4ff34d443241c1c0c28cae0d5f8))
-* packages/cubejs-client-react/package.json to reduce vulnerabilities ([#5390](https://github.com/cube-js/cube.js/issues/5390)) ([0ab9c30](https://github.com/cube-js/cube.js/commit/0ab9c30692c70d3776a8429197915090fef61d4f))
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.28.1](https://github.com/cube-js/cube.js/compare/v0.28.0...v0.28.1) (2021-07-19)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+# [0.28.0](https://github.com/cube-js/cube.js/compare/v0.27.53...v0.28.0) (2021-07-17)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.31.14](https://github.com/cube-js/cube.js/compare/v0.31.13...v0.31.14) (2022-11-14)
+## [0.27.51](https://github.com/cube-js/cube.js/compare/v0.27.50...v0.27.51) (2021-07-13)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-### Bug Fixes
+## [0.27.48](https://github.com/cube-js/cube.js/compare/v0.27.47...v0.27.48) (2021-07-08)
 
-* **playground:** schemaVersion updates ([5c4880f](https://github.com/cube-js/cube.js/commit/5c4880f1fa30189798c0b0ea42df67c7fd0aea75))
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.27.47](https://github.com/cube-js/cube.js/compare/v0.27.46...v0.27.47) (2021-07-06)
 
 ### Features
 
-* **playground:** ability to rerun queries ([#5597](https://github.com/cube-js/cube.js/issues/5597)) ([6ef8ce9](https://github.com/cube-js/cube.js/commit/6ef8ce91740086dc0b10ea11d7133f8be1e2ef0a))
+- **@cubejs-client/playground:** rollup designer v2 ([#3018](https://github.com/cube-js/cube.js/issues/3018)) ([07e2427](https://github.com/cube-js/cube.js/commit/07e2427bb8050a74bae3a4d9206a7cfee6944022))
 
+## [0.27.44](https://github.com/cube-js/cube.js/compare/v0.27.43...v0.27.44) (2021-06-29)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.27.41](https://github.com/cube-js/cube.js/compare/v0.27.40...v0.27.41) (2021-06-25)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.31.13](https://github.com/cube-js/cube.js/compare/v0.31.12...v0.31.13) (2022-11-08)
+## [0.27.36](https://github.com/cube-js/cube.js/compare/v0.27.35...v0.27.36) (2021-06-21)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.27.35](https://github.com/cube-js/cube.js/compare/v0.27.34...v0.27.35) (2021-06-18)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.27.32](https://github.com/cube-js/cube.js/compare/v0.27.31...v0.27.32) (2021-06-12)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.31.9](https://github.com/cube-js/cube.js/compare/v0.31.8...v0.31.9) (2022-11-01)
+## [0.27.31](https://github.com/cube-js/cube.js/compare/v0.27.30...v0.27.31) (2021-06-11)
 
-**Note:** Version bump only for package @cubejs-client/react
+### Features
 
+- **@cubejs-client/playground:** query tabs, preserve query history ([#2915](https://github.com/cube-js/cube.js/issues/2915)) ([d794d9e](https://github.com/cube-js/cube.js/commit/d794d9ec1281a2bc66a9194496df0eeb97936217))
 
+## [0.27.30](https://github.com/cube-js/cube.js/compare/v0.27.29...v0.27.30) (2021-06-04)
 
+### Bug Fixes
 
+- **@cubejs-client/react:** order reset ([#2901](https://github.com/cube-js/cube.js/issues/2901)) ([536819f](https://github.com/cube-js/cube.js/commit/536819f5551e2846131d3f0459a46eba1306492a))
 
-## [0.31.8](https://github.com/cube-js/cube.js/compare/v0.31.7...v0.31.8) (2022-10-30)
+## [0.27.26](https://github.com/cube-js/cube.js/compare/v0.27.25...v0.27.26) (2021-06-01)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.27.25](https://github.com/cube-js/cube.js/compare/v0.27.24...v0.27.25) (2021-06-01)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.27.24](https://github.com/cube-js/cube.js/compare/v0.27.23...v0.27.24) (2021-05-29)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-# [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
+## [0.27.22](https://github.com/cube-js/cube.js/compare/v0.27.21...v0.27.22) (2021-05-27)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.27.20](https://github.com/cube-js/cube.js/compare/v0.27.19...v0.27.20) (2021-05-25)
 
+### Bug Fixes
 
+- **@cubejs-client/playground:** reorder reset ([#2810](https://github.com/cube-js/cube.js/issues/2810)) ([2d22683](https://github.com/cube-js/cube.js/commit/2d22683e7f02447f22a74db5fc2e0a122939f7e8))
 
-
-## [0.30.74](https://github.com/cube-js/cube.js/compare/v0.30.73...v0.30.74) (2022-09-20)
+## [0.27.19](https://github.com/cube-js/cube.js/compare/v0.27.18...v0.27.19) (2021-05-24)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.27.17](https://github.com/cube-js/cube.js/compare/v0.27.16...v0.27.17) (2021-05-22)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.27.15](https://github.com/cube-js/cube.js/compare/v0.27.14...v0.27.15) (2021-05-18)
 
+### Bug Fixes
 
-## [0.30.69](https://github.com/cube-js/cube.js/compare/v0.30.68...v0.30.69) (2022-09-13)
+- **@cubejs-client/playground:** display error message on all tabs ([#2741](https://github.com/cube-js/cube.js/issues/2741)) ([0b9b597](https://github.com/cube-js/cube.js/commit/0b9b597f8e936c9daf287c5ed2e03ecdf5af2a0b))
 
-**Note:** Version bump only for package @cubejs-client/react
+### Features
 
+- **@cubejs-client/playground:** member grouping ([#2736](https://github.com/cube-js/cube.js/issues/2736)) ([7659438](https://github.com/cube-js/cube.js/commit/76594383e08e44354c5966f8e60107d65e05ddab))
 
+## [0.27.14](https://github.com/cube-js/cube.js/compare/v0.27.13...v0.27.14) (2021-05-13)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-
-## [0.30.64](https://github.com/cube-js/cube.js/compare/v0.30.63...v0.30.64) (2022-09-07)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.30.60](https://github.com/cube-js/cube.js/compare/v0.30.59...v0.30.60) (2022-08-28)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.30.46](https://github.com/cube-js/cube.js/compare/v0.30.45...v0.30.46) (2022-08-10)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.30.40](https://github.com/cube-js/cube.js/compare/v0.30.39...v0.30.40) (2022-07-26)
-
-
-### Bug Fixes
-
-* **client-react:** update hooks for React 18 StrictMode ([#4999](https://github.com/cube-js/cube.js/issues/4999)) ([fd6352c](https://github.com/cube-js/cube.js/commit/fd6352c61a614afef61b2a9d4332ecf300594b3b))
-
-
-
-
-
-## [0.30.30](https://github.com/cube-js/cube.js/compare/v0.30.29...v0.30.30) (2022-07-05)
-
-
-### Bug Fixes
-
-* **client-react:** useIsMounted hook compatible with React 18 StrictMode ([#4740](https://github.com/cube-js/cube.js/issues/4740)) ([aa7d3a4](https://github.com/cube-js/cube.js/commit/aa7d3a4788d38027f59c77bd567270a98a43b689))
-
-
-
-
-
-## [0.30.29](https://github.com/cube-js/cube.js/compare/v0.30.28...v0.30.29) (2022-07-01)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.30.4](https://github.com/cube-js/cube.js/compare/v0.30.3...v0.30.4) (2022-05-20)
-
-
-### Bug Fixes
-
-* **playground:** Remove all time time dimension without granularity ([#4564](https://github.com/cube-js/cube.js/issues/4564)) ([054f488](https://github.com/cube-js/cube.js/commit/054f488ce6b8bfa103cd435f99178ca1f2fa38c7))
-
-
-
-
-
-# [0.30.0](https://github.com/cube-js/cube.js/compare/v0.29.57...v0.30.0) (2022-05-11)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.29.54](https://github.com/cube-js/cube.js/compare/v0.29.53...v0.29.54) (2022-05-03)
-
-
-### Features
-
-* Detailed client TS types ([#4446](https://github.com/cube-js/cube.js/issues/4446)) Thanks [@reify-thomas-smith](https://github.com/reify-thomas-smith) ! ([977cce0](https://github.com/cube-js/cube.js/commit/977cce0c440bc73c0e6b5ad0c10af926b7386873)), closes [#4202](https://github.com/cube-js/cube.js/issues/4202)
-
-
-
-
-
-## [0.29.53](https://github.com/cube-js/cube.js/compare/v0.29.52...v0.29.53) (2022-04-29)
-
-
-### Features
-
-* **@cubejs-client/core:** Accept immutable queries ([#4366](https://github.com/cube-js/cube.js/issues/4366)) Thanks [@reify-thomas-smith](https://github.com/reify-thomas-smith)! ([19b1514](https://github.com/cube-js/cube.js/commit/19b1514d75cc47e0f081dd02e8de0a34aed118bb)), closes [#4160](https://github.com/cube-js/cube.js/issues/4160)
-* **playground:** display error stack traces ([#4438](https://github.com/cube-js/cube.js/issues/4438)) ([0932cda](https://github.com/cube-js/cube.js/commit/0932cdad2a66caefd29d648ab63dd72f91239438))
-
-
-
-
-
-## [0.29.51](https://github.com/cube-js/cube.js/compare/v0.29.50...v0.29.51) (2022-04-22)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.29.48](https://github.com/cube-js/cube.js/compare/v0.29.47...v0.29.48) (2022-04-14)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.29.43](https://github.com/cube-js/cube.js/compare/v0.29.42...v0.29.43) (2022-04-07)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.29.42](https://github.com/cube-js/cube.js/compare/v0.29.41...v0.29.42) (2022-04-04)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.29.33](https://github.com/cube-js/cube.js/compare/v0.29.32...v0.29.33) (2022-03-17)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.29.29](https://github.com/cube-js/cube.js/compare/v0.29.28...v0.29.29) (2022-03-03)
-
-
-### Bug Fixes
-
-* **playground:** prevent params to shift around when removing filters ([e3d17ae](https://github.com/cube-js/cube.js/commit/e3d17ae7b2b8340ee39ea6464773b2676dc5a9f6))
-
-
-
-
-
-## [0.29.24](https://github.com/cube-js/cube.js/compare/v0.29.23...v0.29.24) (2022-02-01)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.29.23](https://github.com/cube-js/cube.js/compare/v0.29.22...v0.29.23) (2022-01-26)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.29.8](https://github.com/cube-js/cube.js/compare/v0.29.7...v0.29.8) (2021-12-21)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.29.5](https://github.com/cube-js/cube.js/compare/v0.29.4...v0.29.5) (2021-12-17)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-# [0.29.0](https://github.com/cube-js/cube.js/compare/v0.28.67...v0.29.0) (2021-12-14)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.28.52](https://github.com/cube-js/cube.js/compare/v0.28.51...v0.28.52) (2021-11-03)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.28.45](https://github.com/cube-js/cube.js/compare/v0.28.44...v0.28.45) (2021-10-19)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.28.38](https://github.com/cube-js/cube.js/compare/v0.28.37...v0.28.38) (2021-09-20)
-
-
-### Features
-
-* **playground:** time zone for cron expressions ([#3441](https://github.com/cube-js/cube.js/issues/3441)) ([b27f509](https://github.com/cube-js/cube.js/commit/b27f509c690c7970ea5443650a141a1bbfcc947b))
-
-
-
-
-
-## [0.28.37](https://github.com/cube-js/cube.js/compare/v0.28.36...v0.28.37) (2021-09-17)
-
-
-### Features
-
-* **playground:** add rollup button ([#3424](https://github.com/cube-js/cube.js/issues/3424)) ([a5db7f1](https://github.com/cube-js/cube.js/commit/a5db7f1905d1eb50bb6e78b4c6c54e03ba7499c9))
-
-
-
-
-
-## [0.28.36](https://github.com/cube-js/cube.js/compare/v0.28.35...v0.28.36) (2021-09-14)
-
-
-### Features
-
-* **@cubejs-client/react:** useCubeMeta hook ([#3050](https://github.com/cube-js/cube.js/issues/3050)) ([e86b3fa](https://github.com/cube-js/cube.js/commit/e86b3fab76f1fa947262c1a54b18f5c7143f0306))
-
-
-
-
-
-## [0.28.35](https://github.com/cube-js/cube.js/compare/v0.28.34...v0.28.35) (2021-09-13)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.28.33](https://github.com/cube-js/cube.js/compare/v0.28.32...v0.28.33) (2021-09-11)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.28.25](https://github.com/cube-js/cube.js/compare/v0.28.24...v0.28.25) (2021-08-20)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.28.24](https://github.com/cube-js/cube.js/compare/v0.28.23...v0.28.24) (2021-08-19)
-
-
-### Features
-
-* Added Quarter to the timeDimensions of ([3f62b2c](https://github.com/cube-js/cube.js/commit/3f62b2c125b2b7b752e370b65be4c89a0c65a623))
-
-
-
-
-
-## [0.28.17](https://github.com/cube-js/cube.js/compare/v0.28.16...v0.28.17) (2021-08-11)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.28.15](https://github.com/cube-js/cube.js/compare/v0.28.14...v0.28.15) (2021-08-06)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** do not filter out time dimensions ([#3201](https://github.com/cube-js/cube.js/issues/3201)) ([0300093](https://github.com/cube-js/cube.js/commit/0300093e0af29b87e7a9018dc8159c1299e3cd85))
-
-
-
-
-
-## [0.28.10](https://github.com/cube-js/cube.js/compare/v0.28.9...v0.28.10) (2021-07-30)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.28.9](https://github.com/cube-js/cube.js/compare/v0.28.8...v0.28.9) (2021-07-29)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.28.7](https://github.com/cube-js/cube.js/compare/v0.28.6...v0.28.7) (2021-07-25)
-
-
-### Bug Fixes
-
-* **@cubejs-client/react:** QueryBuilder incorrectly deduplicates filters based only on member instead of member+operator ([#2948](https://github.com/cube-js/cube.js/issues/2948)) ([#3147](https://github.com/cube-js/cube.js/issues/3147)) ([69d5baf](https://github.com/cube-js/cube.js/commit/69d5baf761bf6a55ec487cb179c61878bbfa6089))
-
-
-
-
-
-## [0.28.6](https://github.com/cube-js/cube.js/compare/v0.28.5...v0.28.6) (2021-07-22)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.28.1](https://github.com/cube-js/cube.js/compare/v0.28.0...v0.28.1) (2021-07-19)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-# [0.28.0](https://github.com/cube-js/cube.js/compare/v0.27.53...v0.28.0) (2021-07-17)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.51](https://github.com/cube-js/cube.js/compare/v0.27.50...v0.27.51) (2021-07-13)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.48](https://github.com/cube-js/cube.js/compare/v0.27.47...v0.27.48) (2021-07-08)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.47](https://github.com/cube-js/cube.js/compare/v0.27.46...v0.27.47) (2021-07-06)
-
-
-### Features
-
-* **@cubejs-client/playground:** rollup designer v2 ([#3018](https://github.com/cube-js/cube.js/issues/3018)) ([07e2427](https://github.com/cube-js/cube.js/commit/07e2427bb8050a74bae3a4d9206a7cfee6944022))
-
-
-
-
-
-## [0.27.44](https://github.com/cube-js/cube.js/compare/v0.27.43...v0.27.44) (2021-06-29)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.41](https://github.com/cube-js/cube.js/compare/v0.27.40...v0.27.41) (2021-06-25)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.36](https://github.com/cube-js/cube.js/compare/v0.27.35...v0.27.36) (2021-06-21)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.35](https://github.com/cube-js/cube.js/compare/v0.27.34...v0.27.35) (2021-06-18)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.32](https://github.com/cube-js/cube.js/compare/v0.27.31...v0.27.32) (2021-06-12)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.31](https://github.com/cube-js/cube.js/compare/v0.27.30...v0.27.31) (2021-06-11)
-
-
-### Features
-
-* **@cubejs-client/playground:** query tabs, preserve query history ([#2915](https://github.com/cube-js/cube.js/issues/2915)) ([d794d9e](https://github.com/cube-js/cube.js/commit/d794d9ec1281a2bc66a9194496df0eeb97936217))
-
-
-
-
-
-## [0.27.30](https://github.com/cube-js/cube.js/compare/v0.27.29...v0.27.30) (2021-06-04)
-
-
-### Bug Fixes
-
-* **@cubejs-client/react:** order reset ([#2901](https://github.com/cube-js/cube.js/issues/2901)) ([536819f](https://github.com/cube-js/cube.js/commit/536819f5551e2846131d3f0459a46eba1306492a))
-
-
-
-
-
-## [0.27.26](https://github.com/cube-js/cube.js/compare/v0.27.25...v0.27.26) (2021-06-01)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.25](https://github.com/cube-js/cube.js/compare/v0.27.24...v0.27.25) (2021-06-01)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.24](https://github.com/cube-js/cube.js/compare/v0.27.23...v0.27.24) (2021-05-29)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.22](https://github.com/cube-js/cube.js/compare/v0.27.21...v0.27.22) (2021-05-27)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.20](https://github.com/cube-js/cube.js/compare/v0.27.19...v0.27.20) (2021-05-25)
-
-
-### Bug Fixes
-
-* **@cubejs-client/playground:** reorder reset ([#2810](https://github.com/cube-js/cube.js/issues/2810)) ([2d22683](https://github.com/cube-js/cube.js/commit/2d22683e7f02447f22a74db5fc2e0a122939f7e8))
-
-
-
-
-
-## [0.27.19](https://github.com/cube-js/cube.js/compare/v0.27.18...v0.27.19) (2021-05-24)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.17](https://github.com/cube-js/cube.js/compare/v0.27.16...v0.27.17) (2021-05-22)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.15](https://github.com/cube-js/cube.js/compare/v0.27.14...v0.27.15) (2021-05-18)
-
-
-### Bug Fixes
-
-* **@cubejs-client/playground:** display error message on all tabs ([#2741](https://github.com/cube-js/cube.js/issues/2741)) ([0b9b597](https://github.com/cube-js/cube.js/commit/0b9b597f8e936c9daf287c5ed2e03ecdf5af2a0b))
-
-
-### Features
-
-* **@cubejs-client/playground:** member grouping ([#2736](https://github.com/cube-js/cube.js/issues/2736)) ([7659438](https://github.com/cube-js/cube.js/commit/76594383e08e44354c5966f8e60107d65e05ddab))
-
-
-
-
-
-## [0.27.14](https://github.com/cube-js/cube.js/compare/v0.27.13...v0.27.14) (2021-05-13)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.13](https://github.com/cube-js/cube.js/compare/v0.27.12...v0.27.13) (2021-05-13)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.27.6](https://github.com/cube-js/cube.js/compare/v0.27.5...v0.27.6) (2021-05-03)
-
-
-### Bug Fixes
-
-* **@cubejs-client/playground:** display server error message ([#2648](https://github.com/cube-js/cube.js/issues/2648)) ([c4d8936](https://github.com/cube-js/cube.js/commit/c4d89369db8796fb136af8370aee2111ac3d0316))
-
-
-
-
-
-## [0.27.5](https://github.com/cube-js/cube.js/compare/v0.27.4...v0.27.5) (2021-05-03)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-# [0.27.0](https://github.com/cube-js/cube.js/compare/v0.26.104...v0.27.0) (2021-04-26)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.26.102](https://github.com/cube-js/cube.js/compare/v0.26.101...v0.26.102) (2021-04-22)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.26.94](https://github.com/cube-js/cube.js/compare/v0.26.93...v0.26.94) (2021-04-13)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.26.93](https://github.com/cube-js/cube.js/compare/v0.26.92...v0.26.93) (2021-04-12)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.26.90](https://github.com/cube-js/cube.js/compare/v0.26.89...v0.26.90) (2021-04-11)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.26.82](https://github.com/cube-js/cube.js/compare/v0.26.81...v0.26.82) (2021-04-07)
-
-
-### Features
-
-* **@cubejs-client/playground:** run query button, disable query auto triggering ([#2476](https://github.com/cube-js/cube.js/issues/2476)) ([92a5d45](https://github.com/cube-js/cube.js/commit/92a5d45eca00e88e925e547a12c3f69b05bfafa6))
-
-
-
-
-
-## [0.26.73](https://github.com/cube-js/cube.js/compare/v0.26.72...v0.26.73) (2021-04-01)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.26.70](https://github.com/cube-js/cube.js/compare/v0.26.69...v0.26.70) (2021-03-26)
-
-
-### Features
-
-* Vue chart renderers ([#2428](https://github.com/cube-js/cube.js/issues/2428)) ([bc2cbab](https://github.com/cube-js/cube.js/commit/bc2cbab22fee860cfc846d1207f6a83899198dd8))
-
-
-
-
-
-## [0.26.69](https://github.com/cube-js/cube.js/compare/v0.26.68...v0.26.69) (2021-03-25)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.26.63](https://github.com/cube-js/cube.js/compare/v0.26.62...v0.26.63) (2021-03-22)
-
-
-### Bug Fixes
-
-* **@cubejs-client/react:** stateChangeHeuristics type definition ([b983344](https://github.com/cube-js/cube.js/commit/b9833441c74ad8901d3115a8dbf409d5eb9fb620))
-
-
-
-
-
-## [0.26.61](https://github.com/cube-js/cube.js/compare/v0.26.60...v0.26.61) (2021-03-18)
-
-
-### Features
-
-* **@cubejs-client/vue:** vue query builder ([#1824](https://github.com/cube-js/cube.js/issues/1824)) ([06ee13f](https://github.com/cube-js/cube.js/commit/06ee13f72ef33372385567ed5e1795087b4f5f53))
-
-
-
-
-
-## [0.26.60](https://github.com/cube-js/cube.js/compare/v0.26.59...v0.26.60) (2021-03-16)
-
-
-### Features
-
-* **@cubejs-client/playground:** Playground components ([#2329](https://github.com/cube-js/cube.js/issues/2329)) ([489dc12](https://github.com/cube-js/cube.js/commit/489dc12d7e9bfa87bfb3c8ffabf76f238c86a2fe))
-
-
-
-
-
-## [0.26.58](https://github.com/cube-js/cube.js/compare/v0.26.56...v0.26.58) (2021-03-14)
-
-
-### Bug Fixes
-
-* lock file conflict preventing dashboard generation, always propagate chartType to viz state ([#2369](https://github.com/cube-js/cube.js/issues/2369)) ([d372fe9](https://github.com/cube-js/cube.js/commit/d372fe9ee69542f9227a5a524e66b99cd69d5dff))
-
-
-
-
-
-## [0.26.57](https://github.com/cube-js/cube.js/compare/v0.26.56...v0.26.57) (2021-03-14)
-
-
-### Bug Fixes
-
-* lock file conflict preventing dashboard generation, always propagate chartType to viz state ([#2369](https://github.com/cube-js/cube.js/issues/2369)) ([d372fe9](https://github.com/cube-js/cube.js/commit/d372fe9ee69542f9227a5a524e66b99cd69d5dff))
-
-
-
-
-
-## [0.26.55](https://github.com/cube-js/cube.js/compare/v0.26.54...v0.26.55) (2021-03-12)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.26.54](https://github.com/cube-js/cube.js/compare/v0.26.53...v0.26.54) (2021-03-12)
-
-
-### Bug Fixes
-
-* **@cubejs-client/react:** Prevent calling onVizStateChanged twice unless needed ([#2351](https://github.com/cube-js/cube.js/issues/2351)) ([3719265](https://github.com/cube-js/cube.js/commit/371926532032bd998a8d2fc200e78883a32f172d))
-
-
-
-
-
-## [0.26.53](https://github.com/cube-js/cube.js/compare/v0.26.52...v0.26.53) (2021-03-11)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.26.49](https://github.com/cube-js/cube.js/compare/v0.26.48...v0.26.49) (2021-03-05)
-
-
-### Bug Fixes
-
-* **@cubejs-client/playground:** error fix ([7ac72e3](https://github.com/cube-js/cube.js/commit/7ac72e39a5ee9f1a31733a6516fb99f620102cba))
-* **@cubejs-client/react:** QueryRenderer TS type fix ([7c002c9](https://github.com/cube-js/cube.js/commit/7c002c920732b7aca6a3e3f7f346447e6f5d1b4d))
-* **@cubejs-client/react:** type fixes ([#2289](https://github.com/cube-js/cube.js/issues/2289)) ([df2b24c](https://github.com/cube-js/cube.js/commit/df2b24c74958858b192292cf22e69915c66a6d26))
-
-
-### Features
-
-* **@cubejs-client/react:** Adding queryError to QueryBuilder for showing dryRun errors ([#2262](https://github.com/cube-js/cube.js/issues/2262)) ([61bac0b](https://github.com/cube-js/cube.js/commit/61bac0b0dcdd81be908143334bd726eacc7b6e49))
-
-
-
-
-
-## [0.26.46](https://github.com/cube-js/cube.js/compare/v0.26.45...v0.26.46) (2021-03-04)
-
-
-### Bug Fixes
-
-* **@cubejs-client/playground:** React and Angular code generation ([#2285](https://github.com/cube-js/cube.js/issues/2285)) ([4313bc8](https://github.com/cube-js/cube.js/commit/4313bc8cbaef819b1b9fc318b0bf9bfc06c1b114))
-
-
-
-
-
-## [0.26.45](https://github.com/cube-js/cube.js/compare/v0.26.44...v0.26.45) (2021-03-04)
-
-
-### Bug Fixes
-
-* **@cubejs-client:** react, core TypeScript fixes ([#2261](https://github.com/cube-js/cube.js/issues/2261)). Thanks to @SteffeyDev! ([4db93af](https://github.com/cube-js/cube.js/commit/4db93af984e737d7a6a448facbc8227907007c5d))
-
-
-
-
-
-## [0.26.41](https://github.com/cube-js/cube.js/compare/v0.26.40...v0.26.41) (2021-03-01)
-
-
-### Bug Fixes
-
-* **@cubejs-client/playground:** meta refresh refactoring ([#2242](https://github.com/cube-js/cube.js/issues/2242)) ([b3d5085](https://github.com/cube-js/cube.js/commit/b3d5085c5dea9a563f6420927ccf2c91ea2e6ec1))
-
-
-
-
-
-## [0.26.34](https://github.com/cube-js/cube.js/compare/v0.26.33...v0.26.34) (2021-02-25)
-
-
-### Bug Fixes
-
-* **@cubejs-client/playground:** loading state ([#2206](https://github.com/cube-js/cube.js/issues/2206)) ([9f21f44](https://github.com/cube-js/cube.js/commit/9f21f44aa9eec03d66b30345631972b3553ecbd5))
-
-
-
-
-
-## [0.26.19](https://github.com/cube-js/cube.js/compare/v0.26.18...v0.26.19) (2021-02-19)
-
-
-### Bug Fixes
-
-* **@cubejs-client/react:** replace dimension with member ([#2142](https://github.com/cube-js/cube.js/issues/2142)) ([622f398](https://github.com/cube-js/cube.js/commit/622f3987ee5d0d1313008f92e9d96aa586ac25c1))
-* **@cubejs-client/react:** type fixes ([#2140](https://github.com/cube-js/cube.js/issues/2140)) ([bca1ff7](https://github.com/cube-js/cube.js/commit/bca1ff72b0204a3cce1d4ee658396b3e22adb1cd))
-
-
-
-
-
-## [0.26.17](https://github.com/cube-js/cube.js/compare/v0.26.16...v0.26.17) (2021-02-18)
-
-
-### Bug Fixes
-
-* **@cubejs-client/playground:** error handling, refresh api ([#2126](https://github.com/cube-js/cube.js/issues/2126)) ([ca730ea](https://github.com/cube-js/cube.js/commit/ca730eaaad9fce49a5e9e45c60aee67d082867f7))
-
-
-
-
-
-## [0.26.13](https://github.com/cube-js/cube.js/compare/v0.26.12...v0.26.13) (2021-02-12)
-
-
-### Bug Fixes
-
-* **@cubejs-client/playground:** Meta error handling ([#2077](https://github.com/cube-js/cube.js/issues/2077)) ([1e6d591](https://github.com/cube-js/cube.js/commit/1e6d591f2857311f0f885ec7d275d110f93bc08a))
-
-
-### Features
-
-* **@cubejs-client/playground:** handle missing members ([#2067](https://github.com/cube-js/cube.js/issues/2067)) ([348b245](https://github.com/cube-js/cube.js/commit/348b245f4086095fbe1515d7821d631047f0008c))
-
-
-
-
-
-## [0.26.7](https://github.com/cube-js/cube.js/compare/v0.26.6...v0.26.7) (2021-02-09)
-
-
-### Features
-
-* **@cubejs-client/playground:** security context editing ([#1986](https://github.com/cube-js/cube.js/issues/1986)) ([90f2365](https://github.com/cube-js/cube.js/commit/90f2365eb21313fb5ea7a80583622e0ed742005c))
-
-
-
-
-
-# [0.26.0](https://github.com/cube-js/cube.js/compare/v0.25.33...v0.26.0) (2021-02-01)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.25.31](https://github.com/cube-js/cube.js/compare/v0.25.30...v0.25.31) (2021-01-28)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.25.22](https://github.com/cube-js/cube.js/compare/v0.25.21...v0.25.22) (2021-01-21)
-
-
-### Features
-
-* **@cubejs-client/playground:** Database connection wizard ([#1671](https://github.com/cube-js/cube.js/issues/1671)) ([ba30883](https://github.com/cube-js/cube.js/commit/ba30883617c806c9f19ed6c879d0b0c2d656aae1))
-
-
-
-
-
-## [0.25.14](https://github.com/cube-js/cube.js/compare/v0.25.13...v0.25.14) (2021-01-11)
-
-
-### Bug Fixes
-
-* **@cubejs-client/react:** useCubeQuery - clear resultSet on exception ([#1734](https://github.com/cube-js/cube.js/issues/1734)) ([a5d19ae](https://github.com/cube-js/cube.js/commit/a5d19aecffc6a613f6e0f0d9346143c4f2e335be))
-
-
-
-
-
-## [0.25.12](https://github.com/cube-js/cube.js/compare/v0.25.11...v0.25.12) (2021-01-05)
-
-
-### Bug Fixes
-
-* **@cubejs-client/react:** updated peer dependency version ([442a979](https://github.com/cube-js/cube.js/commit/442a979e9d5509ffcb71e48d42a4e4944eae98e1))
-
-
-
-
-
-## [0.25.2](https://github.com/cube-js/cube.js/compare/v0.25.1...v0.25.2) (2020-12-27)
-
-
-### Bug Fixes
-
-* **@cubejs-client/react:** prevent state updates on unmounted components ([#1684](https://github.com/cube-js/cube.js/issues/1684)) ([4f3796c](https://github.com/cube-js/cube.js/commit/4f3796c9f402a7b8b54311a08c632270be8e34c3))
-
-
-
-
-
-# [0.25.0](https://github.com/cube-js/cube.js/compare/v0.24.15...v0.25.0) (2020-12-21)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.24.14](https://github.com/cube-js/cube.js/compare/v0.24.13...v0.24.14) (2020-12-19)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.24.13](https://github.com/cube-js/cube.js/compare/v0.24.12...v0.24.13) (2020-12-18)
-
-
-### Bug Fixes
-
-* **@cubejs-client/react:** reset the error on subsequent calls ([#1641](https://github.com/cube-js/cube.js/issues/1641)) ([2a65dae](https://github.com/cube-js/cube.js/commit/2a65dae8d1f327f47d387ff8bbf52193ebb7bf53))
-
-
-
-
-
-## [0.24.12](https://github.com/cube-js/cube.js/compare/v0.24.11...v0.24.12) (2020-12-17)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.24.11](https://github.com/cube-js/cube.js/compare/v0.24.10...v0.24.11) (2020-12-17)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.24.9](https://github.com/cube-js/cube.js/compare/v0.24.8...v0.24.9) (2020-12-16)
-
-
-### Features
-
-* **@cubejs-client/playground:** Angular chart code generation support in Playground ([#1519](https://github.com/cube-js/cube.js/issues/1519)) ([4690e11](https://github.com/cube-js/cube.js/commit/4690e11f417ff65fea8426360f3f5a2b3acd2792)), closes [#1515](https://github.com/cube-js/cube.js/issues/1515) [#1612](https://github.com/cube-js/cube.js/issues/1612)
-* **@cubejs-client/react:** dry run hook ([#1612](https://github.com/cube-js/cube.js/issues/1612)) ([9aea035](https://github.com/cube-js/cube.js/commit/9aea03556ae61f443598ed587538e60239a3be2d))
-
-
-
-
-
-## [0.24.8](https://github.com/cube-js/cube.js/compare/v0.24.7...v0.24.8) (2020-12-15)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.24.4](https://github.com/cube-js/cube.js/compare/v0.24.3...v0.24.4) (2020-12-07)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-# [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.23.15](https://github.com/cube-js/cube.js/compare/v0.23.14...v0.23.15) (2020-11-25)
-
-
-### Features
-
-* **@cubejs-client/react:** support 'compareDateRange' when updating 'timeDimensions' ([#1426](https://github.com/cube-js/cube.js/issues/1426)). Thanks to @BeAnMo! ([6446a58](https://github.com/cube-js/cube.js/commit/6446a58c5d6c983f045dc2062732aacfd69d908a))
-
-
-
-
-
-## [0.23.14](https://github.com/cube-js/cube.js/compare/v0.23.13...v0.23.14) (2020-11-22)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.23.12](https://github.com/cube-js/cube.js/compare/v0.23.11...v0.23.12) (2020-11-17)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.23.11](https://github.com/cube-js/cube.js/compare/v0.23.10...v0.23.11) (2020-11-13)
-
-
-### Bug Fixes
-
-* **@cubejs-playground:** boolean filters support ([#1269](https://github.com/cube-js/cube.js/issues/1269)) ([adda809](https://github.com/cube-js/cube.js/commit/adda809e4cd08436ffdf8f3396a6f35725f3dc22))
-
-
-### Features
-
-* **@cubejs-client/react:** Add minute and second granularities to React QueryBuilder ([#1332](https://github.com/cube-js/cube.js/issues/1332)). Thanks to [@danielnass](https://github.com/danielnass)! ([aa201ae](https://github.com/cube-js/cube.js/commit/aa201aecdc66d920e7a6f84a1043cf5964bc6cb9))
-
-
-
-
-
-## [0.23.10](https://github.com/cube-js/cube.js/compare/v0.23.9...v0.23.10) (2020-11-07)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.23.6](https://github.com/cube-js/cube.js/compare/v0.23.5...v0.23.6) (2020-11-02)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-# [0.23.0](https://github.com/cube-js/cube.js/compare/v0.22.4...v0.23.0) (2020-10-28)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.22.2](https://github.com/cube-js/cube.js/compare/v0.22.1...v0.22.2) (2020-10-26)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.22.1](https://github.com/cube-js/cube.js/compare/v0.22.0...v0.22.1) (2020-10-21)
-
-
-### Bug Fixes
-
-* **@cubejs-playground:** avoid unnecessary load calls, dryRun ([#1210](https://github.com/cube-js/cube.js/issues/1210)) ([aaf4911](https://github.com/cube-js/cube.js/commit/aaf4911))
-
-
-
-
-
-# [0.22.0](https://github.com/cube-js/cube.js/compare/v0.21.2...v0.22.0) (2020-10-20)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.21.1](https://github.com/cube-js/cube.js/compare/v0.21.0...v0.21.1) (2020-10-15)
-
-
-### Bug Fixes
-
-* **@cubejs-client/react:** resultSet ts in for QueryBuilderRenderProps ([#1193](https://github.com/cube-js/cube.js/issues/1193)) ([7e15cf0](https://github.com/cube-js/cube.js/commit/7e15cf0))
-
-
-
-
-
-# [0.21.0](https://github.com/cube-js/cube.js/compare/v0.20.15...v0.21.0) (2020-10-09)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.20.15](https://github.com/cube-js/cube.js/compare/v0.20.14...v0.20.15) (2020-10-09)
+## [0.27.13](https://github.com/cube-js/cube.js/compare/v0.27.12...v0.27.13) (2021-05-13)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
-## [0.20.14](https://github.com/cube-js/cube.js/compare/v0.20.13...v0.20.14) (2020-10-09)
-
+## [0.27.6](https://github.com/cube-js/cube.js/compare/v0.27.5...v0.27.6) (2021-05-03)
 
 ### Bug Fixes
 
-* Filter values can't be changed in Playground -- revert back defaultHeuristic implementation ([30ee112](https://github.com/cube-js/cube.js/commit/30ee112))
-
-
-
-
-
-## [0.20.12](https://github.com/cube-js/cube.js/compare/v0.20.11...v0.20.12) (2020-10-02)
-
-
-### Features
-
-* angular query builder ([#1073](https://github.com/cube-js/cube.js/issues/1073)) ([ea088b3](https://github.com/cube-js/cube.js/commit/ea088b3))
-
-
-
-
+- **@cubejs-client/playground:** display server error message ([#2648](https://github.com/cube-js/cube.js/issues/2648)) ([c4d8936](https://github.com/cube-js/cube.js/commit/c4d89369db8796fb136af8370aee2111ac3d0316))
 
-## [0.20.11](https://github.com/cube-js/cube.js/compare/v0.20.10...v0.20.11) (2020-09-28)
+## [0.27.5](https://github.com/cube-js/cube.js/compare/v0.27.4...v0.27.5) (2021-05-03)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
-## [0.20.10](https://github.com/cube-js/cube.js/compare/v0.20.9...v0.20.10) (2020-09-23)
+# [0.27.0](https://github.com/cube-js/cube.js/compare/v0.26.104...v0.27.0) (2021-04-26)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
-## [0.20.9](https://github.com/cube-js/cube.js/compare/v0.20.8...v0.20.9) (2020-09-19)
+## [0.26.102](https://github.com/cube-js/cube.js/compare/v0.26.101...v0.26.102) (2021-04-22)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
-## [0.20.8](https://github.com/cube-js/cube.js/compare/v0.20.7...v0.20.8) (2020-09-16)
-
-
-### Bug Fixes
-
-* validated query behavior ([#1085](https://github.com/cube-js/cube.js/issues/1085)) ([e93891b](https://github.com/cube-js/cube.js/commit/e93891b))
-
-
-
-
-
-## [0.20.6](https://github.com/cube-js/cube.js/compare/v0.20.5...v0.20.6) (2020-09-10)
-
-
-### Bug Fixes
-
-* pivot control ([05ce626](https://github.com/cube-js/cube.js/commit/05ce626))
-
-
-
-
-
-## [0.20.5](https://github.com/cube-js/cube.js/compare/v0.20.4...v0.20.5) (2020-09-10)
+## [0.26.94](https://github.com/cube-js/cube.js/compare/v0.26.93...v0.26.94) (2021-04-13)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
-## [0.20.3](https://github.com/cube-js/cube.js/compare/v0.20.2...v0.20.3) (2020-09-03)
+## [0.26.93](https://github.com/cube-js/cube.js/compare/v0.26.92...v0.26.93) (2021-04-12)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
-## [0.20.2](https://github.com/cube-js/cube.js/compare/v0.20.1...v0.20.2) (2020-09-02)
+## [0.26.90](https://github.com/cube-js/cube.js/compare/v0.26.89...v0.26.90) (2021-04-11)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.26.82](https://github.com/cube-js/cube.js/compare/v0.26.81...v0.26.82) (2021-04-07)
 
+### Features
 
+- **@cubejs-client/playground:** run query button, disable query auto triggering ([#2476](https://github.com/cube-js/cube.js/issues/2476)) ([92a5d45](https://github.com/cube-js/cube.js/commit/92a5d45eca00e88e925e547a12c3f69b05bfafa6))
 
+## [0.26.73](https://github.com/cube-js/cube.js/compare/v0.26.72...v0.26.73) (2021-04-01)
 
-## [0.20.1](https://github.com/cube-js/cube.js/compare/v0.20.0...v0.20.1) (2020-09-01)
-
-
-### Bug Fixes
-
-* data blending query support ([#1033](https://github.com/cube-js/cube.js/issues/1033)) ([20fc979](https://github.com/cube-js/cube.js/commit/20fc979))
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.26.70](https://github.com/cube-js/cube.js/compare/v0.26.69...v0.26.70) (2021-03-26)
 
 ### Features
 
-* Expose the progress response in the useCubeQuery hook ([#990](https://github.com/cube-js/cube.js/issues/990)). Thanks to [@anton164](https://github.com/anton164) ([01da1fd](https://github.com/cube-js/cube.js/commit/01da1fd))
-
-
-
+- Vue chart renderers ([#2428](https://github.com/cube-js/cube.js/issues/2428)) ([bc2cbab](https://github.com/cube-js/cube.js/commit/bc2cbab22fee860cfc846d1207f6a83899198dd8))
 
+## [0.26.69](https://github.com/cube-js/cube.js/compare/v0.26.68...v0.26.69) (2021-03-25)
 
-# [0.20.0](https://github.com/cube-js/cube.js/compare/v0.19.61...v0.20.0) (2020-08-26)
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.26.63](https://github.com/cube-js/cube.js/compare/v0.26.62...v0.26.63) (2021-03-22)
 
 ### Bug Fixes
 
-* respect timezone in drillDown queries ([#1003](https://github.com/cube-js/cube.js/issues/1003)) ([c128417](https://github.com/cube-js/cube.js/commit/c128417))
+- **@cubejs-client/react:** stateChangeHeuristics type definition ([b983344](https://github.com/cube-js/cube.js/commit/b9833441c74ad8901d3115a8dbf409d5eb9fb620))
 
+## [0.26.61](https://github.com/cube-js/cube.js/compare/v0.26.60...v0.26.61) (2021-03-18)
 
 ### Features
 
-* Data blending ([#1012](https://github.com/cube-js/cube.js/issues/1012)) ([19fd00e](https://github.com/cube-js/cube.js/commit/19fd00e))
-* query limit control ([#910](https://github.com/cube-js/cube.js/issues/910)) ([c6e086b](https://github.com/cube-js/cube.js/commit/c6e086b))
-
-
+- **@cubejs-client/vue:** vue query builder ([#1824](https://github.com/cube-js/cube.js/issues/1824)) ([06ee13f](https://github.com/cube-js/cube.js/commit/06ee13f72ef33372385567ed5e1795087b4f5f53))
 
+## [0.26.60](https://github.com/cube-js/cube.js/compare/v0.26.59...v0.26.60) (2021-03-16)
 
+### Features
 
-## [0.19.56](https://github.com/cube-js/cube.js/compare/v0.19.55...v0.19.56) (2020-08-03)
+- **@cubejs-client/playground:** Playground components ([#2329](https://github.com/cube-js/cube.js/issues/2329)) ([489dc12](https://github.com/cube-js/cube.js/commit/489dc12d7e9bfa87bfb3c8ffabf76f238c86a2fe))
 
+## [0.26.58](https://github.com/cube-js/cube.js/compare/v0.26.56...v0.26.58) (2021-03-14)
 
 ### Bug Fixes
 
-* CubeContext ts type missing ([#913](https://github.com/cube-js/cube.js/issues/913)) ([f5f72cd](https://github.com/cube-js/cube.js/commit/f5f72cd))
-* membersForQuery return type ([#909](https://github.com/cube-js/cube.js/issues/909)) ([4976fcf](https://github.com/cube-js/cube.js/commit/4976fcf))
-
-
-
-
-
-## [0.19.55](https://github.com/cube-js/cube.js/compare/v0.19.54...v0.19.55) (2020-07-23)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.19.54](https://github.com/cube-js/cube.js/compare/v0.19.53...v0.19.54) (2020-07-23)
-
-**Note:** Version bump only for package @cubejs-client/react
-
+- lock file conflict preventing dashboard generation, always propagate chartType to viz state ([#2369](https://github.com/cube-js/cube.js/issues/2369)) ([d372fe9](https://github.com/cube-js/cube.js/commit/d372fe9ee69542f9227a5a524e66b99cd69d5dff))
 
+## [0.26.57](https://github.com/cube-js/cube.js/compare/v0.26.56...v0.26.57) (2021-03-14)
 
+### Bug Fixes
 
+- lock file conflict preventing dashboard generation, always propagate chartType to viz state ([#2369](https://github.com/cube-js/cube.js/issues/2369)) ([d372fe9](https://github.com/cube-js/cube.js/commit/d372fe9ee69542f9227a5a524e66b99cd69d5dff))
 
-## [0.19.53](https://github.com/cube-js/cube.js/compare/v0.19.52...v0.19.53) (2020-07-20)
+## [0.26.55](https://github.com/cube-js/cube.js/compare/v0.26.54...v0.26.55) (2021-03-12)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.26.54](https://github.com/cube-js/cube.js/compare/v0.26.53...v0.26.54) (2021-03-12)
 
+### Bug Fixes
 
+- **@cubejs-client/react:** Prevent calling onVizStateChanged twice unless needed ([#2351](https://github.com/cube-js/cube.js/issues/2351)) ([3719265](https://github.com/cube-js/cube.js/commit/371926532032bd998a8d2fc200e78883a32f172d))
 
-
-## [0.19.51](https://github.com/cube-js/cube.js/compare/v0.19.50...v0.19.51) (2020-07-17)
+## [0.26.53](https://github.com/cube-js/cube.js/compare/v0.26.52...v0.26.53) (2021-03-11)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.26.49](https://github.com/cube-js/cube.js/compare/v0.26.48...v0.26.49) (2021-03-05)
 
+### Bug Fixes
 
-
-
-## [0.19.50](https://github.com/cube-js/cube.js/compare/v0.19.49...v0.19.50) (2020-07-16)
-
+- **@cubejs-client/playground:** error fix ([7ac72e3](https://github.com/cube-js/cube.js/commit/7ac72e39a5ee9f1a31733a6516fb99f620102cba))
+- **@cubejs-client/react:** QueryRenderer TS type fix ([7c002c9](https://github.com/cube-js/cube.js/commit/7c002c920732b7aca6a3e3f7f346447e6f5d1b4d))
+- **@cubejs-client/react:** type fixes ([#2289](https://github.com/cube-js/cube.js/issues/2289)) ([df2b24c](https://github.com/cube-js/cube.js/commit/df2b24c74958858b192292cf22e69915c66a6d26))
 
 ### Features
 
-* ResultSet serializaion and deserializaion ([#836](https://github.com/cube-js/cube.js/issues/836)) ([80b8d41](https://github.com/cube-js/cube.js/commit/80b8d41))
-
-
-
-
-
-## [0.19.48](https://github.com/cube-js/cube.js/compare/v0.19.47...v0.19.48) (2020-07-11)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.19.43](https://github.com/cube-js/cube.js/compare/v0.19.42...v0.19.43) (2020-07-04)
+- **@cubejs-client/react:** Adding queryError to QueryBuilder for showing dryRun errors ([#2262](https://github.com/cube-js/cube.js/issues/2262)) ([61bac0b](https://github.com/cube-js/cube.js/commit/61bac0b0dcdd81be908143334bd726eacc7b6e49))
 
+## [0.26.46](https://github.com/cube-js/cube.js/compare/v0.26.45...v0.26.46) (2021-03-04)
 
 ### Bug Fixes
 
-* **cubejs-client-core:** Display the measure value when the y axis is empty ([#789](https://github.com/cube-js/cube.js/issues/789)) ([7ec6ac6](https://github.com/cube-js/cube.js/commit/7ec6ac6))
-
-
-
-
-
-## [0.19.42](https://github.com/cube-js/cube.js/compare/v0.19.41...v0.19.42) (2020-07-01)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.19.37](https://github.com/cube-js/cube.js/compare/v0.19.36...v0.19.37) (2020-06-26)
+- **@cubejs-client/playground:** React and Angular code generation ([#2285](https://github.com/cube-js/cube.js/issues/2285)) ([4313bc8](https://github.com/cube-js/cube.js/commit/4313bc8cbaef819b1b9fc318b0bf9bfc06c1b114))
 
+## [0.26.45](https://github.com/cube-js/cube.js/compare/v0.26.44...v0.26.45) (2021-03-04)
 
 ### Bug Fixes
 
-* **cubejs-client-react:** order heuristic ([#758](https://github.com/cube-js/cube.js/issues/758)) ([498c10a](https://github.com/cube-js/cube.js/commit/498c10a))
-
-
-### Features
+- **@cubejs-client:** react, core TypeScript fixes ([#2261](https://github.com/cube-js/cube.js/issues/2261)). Thanks to @SteffeyDev! ([4db93af](https://github.com/cube-js/cube.js/commit/4db93af984e737d7a6a448facbc8227907007c5d))
 
-* **cubejs-client-react:** Exposing updateQuery method ([#751](https://github.com/cube-js/cube.js/issues/751)) ([e2083c8](https://github.com/cube-js/cube.js/commit/e2083c8))
-* query builder pivot config support ([#742](https://github.com/cube-js/cube.js/issues/742)) ([4e29057](https://github.com/cube-js/cube.js/commit/4e29057))
+## [0.26.41](https://github.com/cube-js/cube.js/compare/v0.26.40...v0.26.41) (2021-03-01)
 
+### Bug Fixes
 
+- **@cubejs-client/playground:** meta refresh refactoring ([#2242](https://github.com/cube-js/cube.js/issues/2242)) ([b3d5085](https://github.com/cube-js/cube.js/commit/b3d5085c5dea9a563f6420927ccf2c91ea2e6ec1))
 
+## [0.26.34](https://github.com/cube-js/cube.js/compare/v0.26.33...v0.26.34) (2021-02-25)
 
+### Bug Fixes
 
-## [0.19.35](https://github.com/cube-js/cube.js/compare/v0.19.34...v0.19.35) (2020-06-22)
+- **@cubejs-client/playground:** loading state ([#2206](https://github.com/cube-js/cube.js/issues/2206)) ([9f21f44](https://github.com/cube-js/cube.js/commit/9f21f44aa9eec03d66b30345631972b3553ecbd5))
 
+## [0.26.19](https://github.com/cube-js/cube.js/compare/v0.26.18...v0.26.19) (2021-02-19)
 
 ### Bug Fixes
 
-* **cubejs-client-core:** table pivot ([#672](https://github.com/cube-js/cube.js/issues/672)) ([70015f5](https://github.com/cube-js/cube.js/commit/70015f5))
+- **@cubejs-client/react:** replace dimension with member ([#2142](https://github.com/cube-js/cube.js/issues/2142)) ([622f398](https://github.com/cube-js/cube.js/commit/622f3987ee5d0d1313008f92e9d96aa586ac25c1))
+- **@cubejs-client/react:** type fixes ([#2140](https://github.com/cube-js/cube.js/issues/2140)) ([bca1ff7](https://github.com/cube-js/cube.js/commit/bca1ff72b0204a3cce1d4ee658396b3e22adb1cd))
 
+## [0.26.17](https://github.com/cube-js/cube.js/compare/v0.26.16...v0.26.17) (2021-02-18)
 
+### Bug Fixes
 
+- **@cubejs-client/playground:** error handling, refresh api ([#2126](https://github.com/cube-js/cube.js/issues/2126)) ([ca730ea](https://github.com/cube-js/cube.js/commit/ca730eaaad9fce49a5e9e45c60aee67d082867f7))
 
+## [0.26.13](https://github.com/cube-js/cube.js/compare/v0.26.12...v0.26.13) (2021-02-12)
 
-## [0.19.31](https://github.com/cube-js/cube.js/compare/v0.19.30...v0.19.31) (2020-06-10)
+### Bug Fixes
 
+- **@cubejs-client/playground:** Meta error handling ([#2077](https://github.com/cube-js/cube.js/issues/2077)) ([1e6d591](https://github.com/cube-js/cube.js/commit/1e6d591f2857311f0f885ec7d275d110f93bc08a))
 
 ### Features
 
-* Query builder order by ([#685](https://github.com/cube-js/cube.js/issues/685)) ([d3c735b](https://github.com/cube-js/cube.js/commit/d3c735b))
-
+- **@cubejs-client/playground:** handle missing members ([#2067](https://github.com/cube-js/cube.js/issues/2067)) ([348b245](https://github.com/cube-js/cube.js/commit/348b245f4086095fbe1515d7821d631047f0008c))
 
+## [0.26.7](https://github.com/cube-js/cube.js/compare/v0.26.6...v0.26.7) (2021-02-09)
 
+### Features
 
+- **@cubejs-client/playground:** security context editing ([#1986](https://github.com/cube-js/cube.js/issues/1986)) ([90f2365](https://github.com/cube-js/cube.js/commit/90f2365eb21313fb5ea7a80583622e0ed742005c))
 
-## [0.19.23](https://github.com/cube-js/cube.js/compare/v0.19.22...v0.19.23) (2020-06-02)
+# [0.26.0](https://github.com/cube-js/cube.js/compare/v0.25.33...v0.26.0) (2021-02-01)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
-## [0.19.22](https://github.com/cube-js/cube.js/compare/v0.19.21...v0.19.22) (2020-05-26)
+## [0.25.31](https://github.com/cube-js/cube.js/compare/v0.25.30...v0.25.31) (2021-01-28)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
-## [0.19.19](https://github.com/cube-js/cube.js/compare/v0.19.18...v0.19.19) (2020-05-15)
-
-
-### Bug Fixes
-
-* corejs version ([8bef3b2](https://github.com/cube-js/cube.js/commit/8bef3b2))
-
+## [0.25.22](https://github.com/cube-js/cube.js/compare/v0.25.21...v0.25.22) (2021-01-21)
 
 ### Features
 
-* ability to add custom meta data for measures, dimensions and segments ([#641](https://github.com/cube-js/cube.js/issues/641)) ([88d5c9b](https://github.com/cube-js/cube.js/commit/88d5c9b)), closes [#625](https://github.com/cube-js/cube.js/issues/625)
-
-
-
-
-
-## [0.19.16](https://github.com/cube-js/cube.js/compare/v0.19.15...v0.19.16) (2020-05-07)
+- **@cubejs-client/playground:** Database connection wizard ([#1671](https://github.com/cube-js/cube.js/issues/1671)) ([ba30883](https://github.com/cube-js/cube.js/commit/ba30883617c806c9f19ed6c879d0b0c2d656aae1))
 
+## [0.25.14](https://github.com/cube-js/cube.js/compare/v0.25.13...v0.25.14) (2021-01-11)
 
 ### Bug Fixes
 
-* **@cubejs-client/react:** options dependency for useEffect: check if `subscribe` has been changed in `useCubeQuery` ([#632](https://github.com/cube-js/cube.js/issues/632)) ([13ab5de](https://github.com/cube-js/cube.js/commit/13ab5de))
-
-
-
-
-
-## [0.19.13](https://github.com/cube-js/cube.js/compare/v0.19.12...v0.19.13) (2020-04-21)
-
-
-### Features
-
-* **react:** `resetResultSetOnChange` option for `QueryRenderer` and `useCubeQuery` ([c8c74d3](https://github.com/cube-js/cube.js/commit/c8c74d3))
-
+- **@cubejs-client/react:** useCubeQuery - clear resultSet on exception ([#1734](https://github.com/cube-js/cube.js/issues/1734)) ([a5d19ae](https://github.com/cube-js/cube.js/commit/a5d19aecffc6a613f6e0f0d9346143c4f2e335be))
 
+## [0.25.12](https://github.com/cube-js/cube.js/compare/v0.25.11...v0.25.12) (2021-01-05)
 
+### Bug Fixes
 
+- **@cubejs-client/react:** updated peer dependency version ([442a979](https://github.com/cube-js/cube.js/commit/442a979e9d5509ffcb71e48d42a4e4944eae98e1))
 
-# [0.19.0](https://github.com/cube-js/cube.js/compare/v0.18.32...v0.19.0) (2020-04-09)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
-
-
-
-## [0.18.18](https://github.com/cube-js/cube.js/compare/v0.18.17...v0.18.18) (2020-03-28)
-
-**Note:** Version bump only for package @cubejs-client/react
-
-
+## [0.25.2](https://github.com/cube-js/cube.js/compare/v0.25.1...v0.25.2) (2020-12-27)
 
+### Bug Fixes
 
+- **@cubejs-client/react:** prevent state updates on unmounted components ([#1684](https://github.com/cube-js/cube.js/issues/1684)) ([4f3796c](https://github.com/cube-js/cube.js/commit/4f3796c9f402a7b8b54311a08c632270be8e34c3))
 
-## [0.18.4](https://github.com/cube-js/cube.js/compare/v0.18.3...v0.18.4) (2020-03-09)
+# [0.25.0](https://github.com/cube-js/cube.js/compare/v0.24.15...v0.25.0) (2020-12-21)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
-# [0.18.0](https://github.com/cube-js/cube.js/compare/v0.17.10...v0.18.0) (2020-03-01)
+## [0.24.14](https://github.com/cube-js/cube.js/compare/v0.24.13...v0.24.14) (2020-12-19)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
-## [0.17.10](https://github.com/cube-js/cube.js/compare/v0.17.9...v0.17.10) (2020-02-20)
-
+## [0.24.13](https://github.com/cube-js/cube.js/compare/v0.24.12...v0.24.13) (2020-12-18)
 
 ### Bug Fixes
 
-* Revert "feat: Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378))" ([b21cbe6](https://github.com/cube-js/cube.js/commit/b21cbe6)), closes [#418](https://github.com/cube-js/cube.js/issues/418)
-
+- **@cubejs-client/react:** reset the error on subsequent calls ([#1641](https://github.com/cube-js/cube.js/issues/1641)) ([2a65dae](https://github.com/cube-js/cube.js/commit/2a65dae8d1f327f47d387ff8bbf52193ebb7bf53))
 
+## [0.24.12](https://github.com/cube-js/cube.js/compare/v0.24.11...v0.24.12) (2020-12-17)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.24.11](https://github.com/cube-js/cube.js/compare/v0.24.10...v0.24.11) (2020-12-17)
 
-## [0.17.9](https://github.com/cube-js/cube.js/compare/v0.17.8...v0.17.9) (2020-02-18)
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.24.9](https://github.com/cube-js/cube.js/compare/v0.24.8...v0.24.9) (2020-12-16)
 
 ### Features
 
-* Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378)) ([cb8d51c](https://github.com/cube-js/cube.js/commit/cb8d51c))
+- **@cubejs-client/playground:** Angular chart code generation support in Playground ([#1519](https://github.com/cube-js/cube.js/issues/1519)) ([4690e11](https://github.com/cube-js/cube.js/commit/4690e11f417ff65fea8426360f3f5a2b3acd2792)), closes [#1515](https://github.com/cube-js/cube.js/issues/1515) [#1612](https://github.com/cube-js/cube.js/issues/1612)
+- **@cubejs-client/react:** dry run hook ([#1612](https://github.com/cube-js/cube.js/issues/1612)) ([9aea035](https://github.com/cube-js/cube.js/commit/9aea03556ae61f443598ed587538e60239a3be2d))
 
+## [0.24.8](https://github.com/cube-js/cube.js/compare/v0.24.7...v0.24.8) (2020-12-15)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.24.4](https://github.com/cube-js/cube.js/compare/v0.24.3...v0.24.4) (2020-12-07)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-# [0.17.0](https://github.com/cube-js/cube.js/compare/v0.16.0...v0.17.0) (2020-02-04)
+# [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.23.15](https://github.com/cube-js/cube.js/compare/v0.23.14...v0.23.15) (2020-11-25)
+
+### Features
 
+- **@cubejs-client/react:** support 'compareDateRange' when updating 'timeDimensions' ([#1426](https://github.com/cube-js/cube.js/issues/1426)). Thanks to @BeAnMo! ([6446a58](https://github.com/cube-js/cube.js/commit/6446a58c5d6c983f045dc2062732aacfd69d908a))
 
+## [0.23.14](https://github.com/cube-js/cube.js/compare/v0.23.13...v0.23.14) (2020-11-22)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-# [0.16.0](https://github.com/cube-js/cube.js/compare/v0.15.4...v0.16.0) (2020-02-04)
+## [0.23.12](https://github.com/cube-js/cube.js/compare/v0.23.11...v0.23.12) (2020-11-17)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.23.11](https://github.com/cube-js/cube.js/compare/v0.23.10...v0.23.11) (2020-11-13)
 
+### Bug Fixes
 
+- **@cubejs-playground:** boolean filters support ([#1269](https://github.com/cube-js/cube.js/issues/1269)) ([adda809](https://github.com/cube-js/cube.js/commit/adda809e4cd08436ffdf8f3396a6f35725f3dc22))
 
+### Features
 
-# [0.15.0](https://github.com/cube-js/cube.js/compare/v0.14.3...v0.15.0) (2020-01-18)
+- **@cubejs-client/react:** Add minute and second granularities to React QueryBuilder ([#1332](https://github.com/cube-js/cube.js/issues/1332)). Thanks to [@danielnass](https://github.com/danielnass)! ([aa201ae](https://github.com/cube-js/cube.js/commit/aa201aecdc66d920e7a6f84a1043cf5964bc6cb9))
+
+## [0.23.10](https://github.com/cube-js/cube.js/compare/v0.23.9...v0.23.10) (2020-11-07)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.23.6](https://github.com/cube-js/cube.js/compare/v0.23.5...v0.23.6) (2020-11-02)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+# [0.23.0](https://github.com/cube-js/cube.js/compare/v0.22.4...v0.23.0) (2020-10-28)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-# [0.14.0](https://github.com/cube-js/cube.js/compare/v0.13.12...v0.14.0) (2020-01-16)
+## [0.22.2](https://github.com/cube-js/cube.js/compare/v0.22.1...v0.22.2) (2020-10-26)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.22.1](https://github.com/cube-js/cube.js/compare/v0.22.0...v0.22.1) (2020-10-21)
 
+### Bug Fixes
 
+- **@cubejs-playground:** avoid unnecessary load calls, dryRun ([#1210](https://github.com/cube-js/cube.js/issues/1210)) ([aaf4911](https://github.com/cube-js/cube.js/commit/aaf4911))
 
-
-## [0.13.12](https://github.com/cube-js/cube.js/compare/v0.13.11...v0.13.12) (2020-01-12)
+# [0.22.0](https://github.com/cube-js/cube.js/compare/v0.21.2...v0.22.0) (2020-10-20)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.21.1](https://github.com/cube-js/cube.js/compare/v0.21.0...v0.21.1) (2020-10-15)
 
+### Bug Fixes
 
+- **@cubejs-client/react:** resultSet ts in for QueryBuilderRenderProps ([#1193](https://github.com/cube-js/cube.js/issues/1193)) ([7e15cf0](https://github.com/cube-js/cube.js/commit/7e15cf0))
 
-
-# [0.13.0](https://github.com/cube-js/cube.js/compare/v0.12.3...v0.13.0) (2019-12-10)
+# [0.21.0](https://github.com/cube-js/cube.js/compare/v0.20.15...v0.21.0) (2020-10-09)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.20.15](https://github.com/cube-js/cube.js/compare/v0.20.14...v0.20.15) (2020-10-09)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.20.14](https://github.com/cube-js/cube.js/compare/v0.20.13...v0.20.14) (2020-10-09)
 
+### Bug Fixes
 
-# [0.12.0](https://github.com/cube-js/cube.js/compare/v0.11.25...v0.12.0) (2019-11-25)
+- Filter values can't be changed in Playground -- revert back defaultHeuristic implementation ([30ee112](https://github.com/cube-js/cube.js/commit/30ee112))
 
-**Note:** Version bump only for package @cubejs-client/react
+## [0.20.12](https://github.com/cube-js/cube.js/compare/v0.20.11...v0.20.12) (2020-10-02)
 
+### Features
 
+- angular query builder ([#1073](https://github.com/cube-js/cube.js/issues/1073)) ([ea088b3](https://github.com/cube-js/cube.js/commit/ea088b3))
 
+## [0.20.11](https://github.com/cube-js/cube.js/compare/v0.20.10...v0.20.11) (2020-09-28)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.11.18](https://github.com/cube-js/cube.js/compare/v0.11.17...v0.11.18) (2019-11-09)
+## [0.20.10](https://github.com/cube-js/cube.js/compare/v0.20.9...v0.20.10) (2020-09-23)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.20.9](https://github.com/cube-js/cube.js/compare/v0.20.8...v0.20.9) (2020-09-19)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.20.8](https://github.com/cube-js/cube.js/compare/v0.20.7...v0.20.8) (2020-09-16)
 
+### Bug Fixes
 
-## [0.11.12](https://github.com/statsbotco/cubejs-client/compare/v0.11.11...v0.11.12) (2019-10-29)
+- validated query behavior ([#1085](https://github.com/cube-js/cube.js/issues/1085)) ([e93891b](https://github.com/cube-js/cube.js/commit/e93891b))
 
+## [0.20.6](https://github.com/cube-js/cube.js/compare/v0.20.5...v0.20.6) (2020-09-10)
 
 ### Bug Fixes
 
-* **react:** Refetch hook only actual query changes ([10b8988](https://github.com/statsbotco/cubejs-client/commit/10b8988))
+- pivot control ([05ce626](https://github.com/cube-js/cube.js/commit/05ce626))
 
+## [0.20.5](https://github.com/cube-js/cube.js/compare/v0.20.4...v0.20.5) (2020-09-10)
+
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.20.3](https://github.com/cube-js/cube.js/compare/v0.20.2...v0.20.3) (2020-09-03)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.20.2](https://github.com/cube-js/cube.js/compare/v0.20.1...v0.20.2) (2020-09-02)
 
-## [0.11.9](https://github.com/statsbotco/cubejs-client/compare/v0.11.8...v0.11.9) (2019-10-23)
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.20.1](https://github.com/cube-js/cube.js/compare/v0.20.0...v0.20.1) (2020-09-01)
 
 ### Bug Fixes
 
-* Support `apiToken` to be an async function: first request sends incorrect token ([a2d0c77](https://github.com/statsbotco/cubejs-client/commit/a2d0c77))
-
+- data blending query support ([#1033](https://github.com/cube-js/cube.js/issues/1033)) ([20fc979](https://github.com/cube-js/cube.js/commit/20fc979))
 
+### Features
 
+- Expose the progress response in the useCubeQuery hook ([#990](https://github.com/cube-js/cube.js/issues/990)). Thanks to [@anton164](https://github.com/anton164) ([01da1fd](https://github.com/cube-js/cube.js/commit/01da1fd))
 
+# [0.20.0](https://github.com/cube-js/cube.js/compare/v0.19.61...v0.20.0) (2020-08-26)
 
-## [0.11.7](https://github.com/statsbotco/cubejs-client/compare/v0.11.6...v0.11.7) (2019-10-22)
+### Bug Fixes
 
+- respect timezone in drillDown queries ([#1003](https://github.com/cube-js/cube.js/issues/1003)) ([c128417](https://github.com/cube-js/cube.js/commit/c128417))
 
 ### Features
 
-* Support `apiToken` to be an async function ([3a3b5f5](https://github.com/statsbotco/cubejs-client/commit/3a3b5f5))
+- Data blending ([#1012](https://github.com/cube-js/cube.js/issues/1012)) ([19fd00e](https://github.com/cube-js/cube.js/commit/19fd00e))
+- query limit control ([#910](https://github.com/cube-js/cube.js/issues/910)) ([c6e086b](https://github.com/cube-js/cube.js/commit/c6e086b))
 
+## [0.19.56](https://github.com/cube-js/cube.js/compare/v0.19.55...v0.19.56) (2020-08-03)
 
+### Bug Fixes
 
+- CubeContext ts type missing ([#913](https://github.com/cube-js/cube.js/issues/913)) ([f5f72cd](https://github.com/cube-js/cube.js/commit/f5f72cd))
+- membersForQuery return type ([#909](https://github.com/cube-js/cube.js/issues/909)) ([4976fcf](https://github.com/cube-js/cube.js/commit/4976fcf))
 
+## [0.19.55](https://github.com/cube-js/cube.js/compare/v0.19.54...v0.19.55) (2020-07-23)
 
-## [0.11.3](https://github.com/statsbotco/cubejs-client/compare/v0.11.2...v0.11.3) (2019-10-15)
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.19.54](https://github.com/cube-js/cube.js/compare/v0.19.53...v0.19.54) (2020-07-23)
 
-### Bug Fixes
+**Note:** Version bump only for package @cubejs-client/react
 
-* `useCubeQuery` doesn't reset error and resultSet on query change ([805d5b1](https://github.com/statsbotco/cubejs-client/commit/805d5b1))
+## [0.19.53](https://github.com/cube-js/cube.js/compare/v0.19.52...v0.19.53) (2020-07-20)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.19.51](https://github.com/cube-js/cube.js/compare/v0.19.50...v0.19.51) (2020-07-17)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.19.50](https://github.com/cube-js/cube.js/compare/v0.19.49...v0.19.50) (2020-07-16)
 
-## [0.11.2](https://github.com/statsbotco/cubejs-client/compare/v0.11.1...v0.11.2) (2019-10-15)
+### Features
 
+- ResultSet serializaion and deserializaion ([#836](https://github.com/cube-js/cube.js/issues/836)) ([80b8d41](https://github.com/cube-js/cube.js/commit/80b8d41))
 
-### Bug Fixes
+## [0.19.48](https://github.com/cube-js/cube.js/compare/v0.19.47...v0.19.48) (2020-07-11)
 
-* Incorrect URL generation in HttpTransport ([7e7020b](https://github.com/statsbotco/cubejs-client/commit/7e7020b))
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.19.43](https://github.com/cube-js/cube.js/compare/v0.19.42...v0.19.43) (2020-07-04)
 
+### Bug Fixes
 
+- **cubejs-client-core:** Display the measure value when the y axis is empty ([#789](https://github.com/cube-js/cube.js/issues/789)) ([7ec6ac6](https://github.com/cube-js/cube.js/commit/7ec6ac6))
 
+## [0.19.42](https://github.com/cube-js/cube.js/compare/v0.19.41...v0.19.42) (2020-07-01)
 
-# [0.11.0](https://github.com/statsbotco/cubejs-client/compare/v0.10.62...v0.11.0) (2019-10-15)
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.19.37](https://github.com/cube-js/cube.js/compare/v0.19.36...v0.19.37) (2020-06-26)
 
-### Features
+### Bug Fixes
 
-* Sockets Preview ([#231](https://github.com/statsbotco/cubejs-client/issues/231)) ([89fc762](https://github.com/statsbotco/cubejs-client/commit/89fc762)), closes [#221](https://github.com/statsbotco/cubejs-client/issues/221)
+- **cubejs-client-react:** order heuristic ([#758](https://github.com/cube-js/cube.js/issues/758)) ([498c10a](https://github.com/cube-js/cube.js/commit/498c10a))
 
+### Features
 
+- **cubejs-client-react:** Exposing updateQuery method ([#751](https://github.com/cube-js/cube.js/issues/751)) ([e2083c8](https://github.com/cube-js/cube.js/commit/e2083c8))
+- query builder pivot config support ([#742](https://github.com/cube-js/cube.js/issues/742)) ([4e29057](https://github.com/cube-js/cube.js/commit/4e29057))
 
+## [0.19.35](https://github.com/cube-js/cube.js/compare/v0.19.34...v0.19.35) (2020-06-22)
 
+### Bug Fixes
 
-## [0.10.61](https://github.com/statsbotco/cubejs-client/compare/v0.10.60...v0.10.61) (2019-10-10)
+- **cubejs-client-core:** table pivot ([#672](https://github.com/cube-js/cube.js/issues/672)) ([70015f5](https://github.com/cube-js/cube.js/commit/70015f5))
 
+## [0.19.31](https://github.com/cube-js/cube.js/compare/v0.19.30...v0.19.31) (2020-06-10)
 
 ### Features
 
-* **react:** Introduce `useCubeQuery` react hook and `CubeProvider` cubejsApi context provider ([19b6fac](https://github.com/statsbotco/cubejs-client/commit/19b6fac))
-
+- Query builder order by ([#685](https://github.com/cube-js/cube.js/issues/685)) ([d3c735b](https://github.com/cube-js/cube.js/commit/d3c735b))
 
+## [0.19.23](https://github.com/cube-js/cube.js/compare/v0.19.22...v0.19.23) (2020-06-02)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.19.22](https://github.com/cube-js/cube.js/compare/v0.19.21...v0.19.22) (2020-05-26)
 
-## [0.10.57](https://github.com/statsbotco/cubejs-client/compare/v0.10.56...v0.10.57) (2019-10-04)
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.19.19](https://github.com/cube-js/cube.js/compare/v0.19.18...v0.19.19) (2020-05-15)
 
 ### Bug Fixes
 
-* **react:** Evade unnecessary heavy chart renders ([b1eb63f](https://github.com/statsbotco/cubejs-client/commit/b1eb63f))
-
-
-
+- corejs version ([8bef3b2](https://github.com/cube-js/cube.js/commit/8bef3b2))
 
+### Features
 
-## [0.10.56](https://github.com/statsbotco/cubejs-client/compare/v0.10.55...v0.10.56) (2019-10-04)
+- ability to add custom meta data for measures, dimensions and segments ([#641](https://github.com/cube-js/cube.js/issues/641)) ([88d5c9b](https://github.com/cube-js/cube.js/commit/88d5c9b)), closes [#625](https://github.com/cube-js/cube.js/issues/625)
 
+## [0.19.16](https://github.com/cube-js/cube.js/compare/v0.19.15...v0.19.16) (2020-05-07)
 
 ### Bug Fixes
 
-* **react:** Evade unnecessary heavy chart renders ([bdcc569](https://github.com/statsbotco/cubejs-client/commit/bdcc569))
-
+- **@cubejs-client/react:** options dependency for useEffect: check if `subscribe` has been changed in `useCubeQuery` ([#632](https://github.com/cube-js/cube.js/issues/632)) ([13ab5de](https://github.com/cube-js/cube.js/commit/13ab5de))
 
+## [0.19.13](https://github.com/cube-js/cube.js/compare/v0.19.12...v0.19.13) (2020-04-21)
 
+### Features
 
+- **react:** `resetResultSetOnChange` option for `QueryRenderer` and `useCubeQuery` ([c8c74d3](https://github.com/cube-js/cube.js/commit/c8c74d3))
 
-## [0.10.55](https://github.com/statsbotco/cubejs-client/compare/v0.10.54...v0.10.55) (2019-10-03)
+# [0.19.0](https://github.com/cube-js/cube.js/compare/v0.18.32...v0.19.0) (2020-04-09)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.18.18](https://github.com/cube-js/cube.js/compare/v0.18.17...v0.18.18) (2020-03-28)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.18.4](https://github.com/cube-js/cube.js/compare/v0.18.3...v0.18.4) (2020-03-09)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.10.53](https://github.com/statsbotco/cubejs-client/compare/v0.10.52...v0.10.53) (2019-10-02)
-
-
-### Features
-
-* **client-react:** provide isQueryPresent() as static API method ([59dc5ce](https://github.com/statsbotco/cubejs-client/commit/59dc5ce))
-
+# [0.18.0](https://github.com/cube-js/cube.js/compare/v0.17.10...v0.18.0) (2020-03-01)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.17.10](https://github.com/cube-js/cube.js/compare/v0.17.9...v0.17.10) (2020-02-20)
 
+### Bug Fixes
 
-## [0.10.43](https://github.com/statsbotco/cubejs-client/compare/v0.10.42...v0.10.43) (2019-09-27)
+- Revert "feat: Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378))" ([b21cbe6](https://github.com/cube-js/cube.js/commit/b21cbe6)), closes [#418](https://github.com/cube-js/cube.js/issues/418)
 
+## [0.17.9](https://github.com/cube-js/cube.js/compare/v0.17.8...v0.17.9) (2020-02-18)
 
 ### Features
 
-* Dynamic dashboards ([#218](https://github.com/statsbotco/cubejs-client/issues/218)) ([2c6cdc9](https://github.com/statsbotco/cubejs-client/commit/2c6cdc9))
+- Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378)) ([cb8d51c](https://github.com/cube-js/cube.js/commit/cb8d51c))
 
+# [0.17.0](https://github.com/cube-js/cube.js/compare/v0.16.0...v0.17.0) (2020-02-04)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+# [0.16.0](https://github.com/cube-js/cube.js/compare/v0.15.4...v0.16.0) (2020-02-04)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.10.16](https://github.com/statsbotco/cubejs-client/compare/v0.10.15...v0.10.16) (2019-07-20)
+# [0.15.0](https://github.com/cube-js/cube.js/compare/v0.14.3...v0.15.0) (2020-01-18)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+# [0.14.0](https://github.com/cube-js/cube.js/compare/v0.13.12...v0.14.0) (2020-01-16)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.13.12](https://github.com/cube-js/cube.js/compare/v0.13.11...v0.13.12) (2020-01-12)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.10.15](https://github.com/statsbotco/cubejs-client/compare/v0.10.14...v0.10.15) (2019-07-13)
+# [0.13.0](https://github.com/cube-js/cube.js/compare/v0.12.3...v0.13.0) (2019-12-10)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+# [0.12.0](https://github.com/cube-js/cube.js/compare/v0.11.25...v0.12.0) (2019-11-25)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.11.18](https://github.com/cube-js/cube.js/compare/v0.11.17...v0.11.18) (2019-11-09)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.10.14](https://github.com/statsbotco/cubejs-client/compare/v0.10.13...v0.10.14) (2019-07-13)
+## [0.11.12](https://github.com/statsbotco/cubejs-client/compare/v0.11.11...v0.11.12) (2019-10-29)
 
+### Bug Fixes
 
-### Features
+- **react:** Refetch hook only actual query changes ([10b8988](https://github.com/statsbotco/cubejs-client/commit/10b8988))
 
-* **playground:** Show Query ([dc45fcb](https://github.com/statsbotco/cubejs-client/commit/dc45fcb))
+## [0.11.9](https://github.com/statsbotco/cubejs-client/compare/v0.11.8...v0.11.9) (2019-10-23)
 
+### Bug Fixes
 
+- Support `apiToken` to be an async function: first request sends incorrect token ([a2d0c77](https://github.com/statsbotco/cubejs-client/commit/a2d0c77))
 
+## [0.11.7](https://github.com/statsbotco/cubejs-client/compare/v0.11.6...v0.11.7) (2019-10-22)
 
+### Features
 
-# [0.10.0](https://github.com/statsbotco/cubejs-client/compare/v0.9.24...v0.10.0) (2019-06-21)
+- Support `apiToken` to be an async function ([3a3b5f5](https://github.com/statsbotco/cubejs-client/commit/3a3b5f5))
 
-**Note:** Version bump only for package @cubejs-client/react
+## [0.11.3](https://github.com/statsbotco/cubejs-client/compare/v0.11.2...v0.11.3) (2019-10-15)
 
+### Bug Fixes
 
+- `useCubeQuery` doesn't reset error and resultSet on query change ([805d5b1](https://github.com/statsbotco/cubejs-client/commit/805d5b1))
 
+## [0.11.2](https://github.com/statsbotco/cubejs-client/compare/v0.11.1...v0.11.2) (2019-10-15)
 
+### Bug Fixes
 
-# [0.9.0](https://github.com/statsbotco/cubejs-client/compare/v0.8.7...v0.9.0) (2019-05-11)
+- Incorrect URL generation in HttpTransport ([7e7020b](https://github.com/statsbotco/cubejs-client/commit/7e7020b))
 
-**Note:** Version bump only for package @cubejs-client/react
+# [0.11.0](https://github.com/statsbotco/cubejs-client/compare/v0.10.62...v0.11.0) (2019-10-15)
 
+### Features
 
+- Sockets Preview ([#231](https://github.com/statsbotco/cubejs-client/issues/231)) ([89fc762](https://github.com/statsbotco/cubejs-client/commit/89fc762)), closes [#221](https://github.com/statsbotco/cubejs-client/issues/221)
 
+## [0.10.61](https://github.com/statsbotco/cubejs-client/compare/v0.10.60...v0.10.61) (2019-10-10)
 
+### Features
 
-## [0.8.7](https://github.com/statsbotco/cubejs-client/compare/v0.8.6...v0.8.7) (2019-05-09)
+- **react:** Introduce `useCubeQuery` react hook and `CubeProvider` cubejsApi context provider ([19b6fac](https://github.com/statsbotco/cubejs-client/commit/19b6fac))
 
+## [0.10.57](https://github.com/statsbotco/cubejs-client/compare/v0.10.56...v0.10.57) (2019-10-04)
 
 ### Bug Fixes
 
-* **cubejs-react:** add core-js dependency ([#107](https://github.com/statsbotco/cubejs-client/issues/107)) ([0e13ffe](https://github.com/statsbotco/cubejs-client/commit/0e13ffe))
-
+- **react:** Evade unnecessary heavy chart renders ([b1eb63f](https://github.com/statsbotco/cubejs-client/commit/b1eb63f))
 
+## [0.10.56](https://github.com/statsbotco/cubejs-client/compare/v0.10.55...v0.10.56) (2019-10-04)
 
+### Bug Fixes
 
+- **react:** Evade unnecessary heavy chart renders ([bdcc569](https://github.com/statsbotco/cubejs-client/commit/bdcc569))
 
-## [0.8.4](https://github.com/statsbotco/cubejs-client/compare/v0.8.3...v0.8.4) (2019-05-02)
+## [0.10.55](https://github.com/statsbotco/cubejs-client/compare/v0.10.54...v0.10.55) (2019-10-03)
 
 **Note:** Version bump only for package @cubejs-client/react
 
+## [0.10.53](https://github.com/statsbotco/cubejs-client/compare/v0.10.52...v0.10.53) (2019-10-02)
 
+### Features
 
+- **client-react:** provide isQueryPresent() as static API method ([59dc5ce](https://github.com/statsbotco/cubejs-client/commit/59dc5ce))
 
+## [0.10.43](https://github.com/statsbotco/cubejs-client/compare/v0.10.42...v0.10.43) (2019-09-27)
 
-## [0.8.1](https://github.com/statsbotco/cubejs-client/compare/v0.8.0...v0.8.1) (2019-04-30)
+### Features
 
-**Note:** Version bump only for package @cubejs-client/react
+- Dynamic dashboards ([#218](https://github.com/statsbotco/cubejs-client/issues/218)) ([2c6cdc9](https://github.com/statsbotco/cubejs-client/commit/2c6cdc9))
 
+## [0.10.16](https://github.com/statsbotco/cubejs-client/compare/v0.10.15...v0.10.16) (2019-07-20)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.10.15](https://github.com/statsbotco/cubejs-client/compare/v0.10.14...v0.10.15) (2019-07-13)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-# [0.8.0](https://github.com/statsbotco/cubejs-client/compare/v0.7.10...v0.8.0) (2019-04-29)
+## [0.10.14](https://github.com/statsbotco/cubejs-client/compare/v0.10.13...v0.10.14) (2019-07-13)
 
-**Note:** Version bump only for package @cubejs-client/react
+### Features
 
+- **playground:** Show Query ([dc45fcb](https://github.com/statsbotco/cubejs-client/commit/dc45fcb))
 
+# [0.10.0](https://github.com/statsbotco/cubejs-client/compare/v0.9.24...v0.10.0) (2019-06-21)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+# [0.9.0](https://github.com/statsbotco/cubejs-client/compare/v0.8.7...v0.9.0) (2019-05-11)
 
-## [0.7.10](https://github.com/statsbotco/cubejs-client/compare/v0.7.9...v0.7.10) (2019-04-25)
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.8.7](https://github.com/statsbotco/cubejs-client/compare/v0.8.6...v0.8.7) (2019-05-09)
 
 ### Bug Fixes
 
-* **client-core:** Table pivot incorrectly behaves with multiple measures ([adb2270](https://github.com/statsbotco/cubejs-client/commit/adb2270))
+- **cubejs-react:** add core-js dependency ([#107](https://github.com/statsbotco/cubejs-client/issues/107)) ([0e13ffe](https://github.com/statsbotco/cubejs-client/commit/0e13ffe))
 
+## [0.8.4](https://github.com/statsbotco/cubejs-client/compare/v0.8.3...v0.8.4) (2019-05-02)
 
+**Note:** Version bump only for package @cubejs-client/react
 
+## [0.8.1](https://github.com/statsbotco/cubejs-client/compare/v0.8.0...v0.8.1) (2019-04-30)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-## [0.7.6](https://github.com/statsbotco/cubejs-client/compare/v0.7.5...v0.7.6) (2019-04-23)
+# [0.8.0](https://github.com/statsbotco/cubejs-client/compare/v0.7.10...v0.8.0) (2019-04-29)
 
+**Note:** Version bump only for package @cubejs-client/react
 
-### Bug Fixes
+## [0.7.10](https://github.com/statsbotco/cubejs-client/compare/v0.7.9...v0.7.10) (2019-04-25)
 
-* Use cross-fetch instead of isomorphic-fetch to allow React-Native builds ([#92](https://github.com/statsbotco/cubejs-client/issues/92)) ([79150f4](https://github.com/statsbotco/cubejs-client/commit/79150f4))
+### Bug Fixes
 
+- **client-core:** Table pivot incorrectly behaves with multiple measures ([adb2270](https://github.com/statsbotco/cubejs-client/commit/adb2270))
 
+## [0.7.6](https://github.com/statsbotco/cubejs-client/compare/v0.7.5...v0.7.6) (2019-04-23)
 
+### Bug Fixes
 
+- Use cross-fetch instead of isomorphic-fetch to allow React-Native builds ([#92](https://github.com/statsbotco/cubejs-client/issues/92)) ([79150f4](https://github.com/statsbotco/cubejs-client/commit/79150f4))
 
 ## [0.7.3](https://github.com/statsbotco/cubejs-client/compare/v0.7.2...v0.7.3) (2019-04-16)
 
-
 ### Bug Fixes
 
-* Allow SSR: use isomorphic-fetch instead of whatwg-fetch. ([902e581](https://github.com/statsbotco/cubejs-client/commit/902e581)), closes [#1](https://github.com/statsbotco/cubejs-client/issues/1)
-
-
-
-
+- Allow SSR: use isomorphic-fetch instead of whatwg-fetch. ([902e581](https://github.com/statsbotco/cubejs-client/commit/902e581)), closes [#1](https://github.com/statsbotco/cubejs-client/issues/1)
 
 # [0.7.0](https://github.com/statsbotco/cubejs-client/compare/v0.6.2...v0.7.0) (2019-04-15)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
 # [0.6.0](https://github.com/statsbotco/cubejs-client/compare/v0.5.2...v0.6.0) (2019-04-09)
 
-
 ### Features
 
-* QueryBuilder heuristics. Playground area, table and number implementation. ([c883a48](https://github.com/statsbotco/cubejs-client/commit/c883a48))
-
-
-
-
+- QueryBuilder heuristics. Playground area, table and number implementation. ([c883a48](https://github.com/statsbotco/cubejs-client/commit/c883a48))
 
 ## [0.5.2](https://github.com/statsbotco/cubejs-client/compare/v0.5.1...v0.5.2) (2019-04-05)
 
-
 ### Features
 
-* Playground UX improvements ([6760a1d](https://github.com/statsbotco/cubejs-client/commit/6760a1d))
-
-
-
-
+- Playground UX improvements ([6760a1d](https://github.com/statsbotco/cubejs-client/commit/6760a1d))
 
 ## [0.5.1](https://github.com/statsbotco/cubejs-client/compare/v0.5.0...v0.5.1) (2019-04-02)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
 # [0.5.0](https://github.com/statsbotco/cubejs-client/compare/v0.4.6...v0.5.0) (2019-04-01)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
 ## [0.4.5](https://github.com/statsbotco/cubejs-client/compare/v0.4.4...v0.4.5) (2019-03-21)
 
-
 ### Bug Fixes
 
-* client-react - query prop now has default blank value ([#54](https://github.com/statsbotco/cubejs-client/issues/54)) ([27e7090](https://github.com/statsbotco/cubejs-client/commit/27e7090))
-
+- client-react - query prop now has default blank value ([#54](https://github.com/statsbotco/cubejs-client/issues/54)) ([27e7090](https://github.com/statsbotco/cubejs-client/commit/27e7090))
 
 ### Features
 
-* Playground filters implementation ([de4315d](https://github.com/statsbotco/cubejs-client/commit/de4315d))
-
-
-
-
+- Playground filters implementation ([de4315d](https://github.com/statsbotco/cubejs-client/commit/de4315d))
 
 ## [0.4.4](https://github.com/statsbotco/cubejs-client/compare/v0.4.3...v0.4.4) (2019-03-17)
 
-
 ### Features
 
-* Introduce Schema generation UI in Playground ([349c7d0](https://github.com/statsbotco/cubejs-client/commit/349c7d0))
-
-
-
-
+- Introduce Schema generation UI in Playground ([349c7d0](https://github.com/statsbotco/cubejs-client/commit/349c7d0))
 
 ## [0.4.1](https://github.com/statsbotco/cubejs-client/compare/v0.4.0...v0.4.1) (2019-03-14)
 
 **Note:** Version bump only for package @cubejs-client/react
 
-
-
-
-
 ## [0.3.5-alpha.0](https://github.com/statsbotco/cubejs-client/compare/v0.3.5...v0.3.5-alpha.0) (2019-03-12)
 
 **Note:** Version bump only for package @cubejs-client/react
diff --git a/packages/cubejs-client-react/package.json b/packages/cubejs-client-react/package.json
index 1ba551b3e1..d6d55d81a5 100644
--- a/packages/cubejs-client-react/package.json
+++ b/packages/cubejs-client-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/react",
-  "version": "1.1.16",
+  "version": "1.2.14",
   "author": "Cube Dev, Inc.",
   "license": "MIT",
   "engines": {},
@@ -24,7 +24,7 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.1.2",
-    "@cubejs-client/core": "1.1.12",
+    "@cubejs-client/core": "1.2.14",
     "core-js": "^3.6.5",
     "ramda": "^0.27.2"
   },
diff --git a/packages/cubejs-client-vue/CHANGELOG.md b/packages/cubejs-client-vue/CHANGELOG.md
index 9cedd99c4c..3c2e937dc7 100644
--- a/packages/cubejs-client-vue/CHANGELOG.md
+++ b/packages/cubejs-client-vue/CHANGELOG.md
@@ -3,1563 +3,870 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.1.12](https://github.com/cube-js/cube.js/compare/v1.1.11...v1.1.12) (2025-01-09)
+## [1.2.14](https://github.com/cube-js/cube.js/compare/v1.2.13...v1.2.14) (2025-02-28)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [1.2.13](https://github.com/cube-js/cube.js/compare/v1.2.12...v1.2.13) (2025-02-26)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [1.2.12](https://github.com/cube-js/cube.js/compare/v1.2.11...v1.2.12) (2025-02-26)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-# [1.0.0](https://github.com/cube-js/cube.js/compare/v0.36.11...v1.0.0) (2024-10-15)
+## [1.2.11](https://github.com/cube-js/cube.js/compare/v1.2.10...v1.2.11) (2025-02-25)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [1.2.10](https://github.com/cube-js/cube.js/compare/v1.2.9...v1.2.10) (2025-02-24)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [1.2.9](https://github.com/cube-js/cube.js/compare/v1.2.8...v1.2.9) (2025-02-21)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.36.4](https://github.com/cube-js/cube.js/compare/v0.36.3...v0.36.4) (2024-09-27)
+## [1.2.8](https://github.com/cube-js/cube.js/compare/v1.2.7...v1.2.8) (2025-02-21)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [1.2.7](https://github.com/cube-js/cube.js/compare/v1.2.6...v1.2.7) (2025-02-20)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [1.2.6](https://github.com/cube-js/cube.js/compare/v1.2.5...v1.2.6) (2025-02-18)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.36.2](https://github.com/cube-js/cube.js/compare/v0.36.1...v0.36.2) (2024-09-18)
+## [1.2.5](https://github.com/cube-js/cube.js/compare/v1.2.4...v1.2.5) (2025-02-13)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [1.2.4](https://github.com/cube-js/cube.js/compare/v1.2.3...v1.2.4) (2025-02-11)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [1.2.3](https://github.com/cube-js/cube.js/compare/v1.2.2...v1.2.3) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-# [0.36.0](https://github.com/cube-js/cube.js/compare/v0.35.81...v0.36.0) (2024-09-13)
+## [1.2.2](https://github.com/cube-js/cube.js/compare/v1.2.1...v1.2.2) (2025-02-06)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [1.2.1](https://github.com/cube-js/cube.js/compare/v1.2.0...v1.2.1) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+# [1.2.0](https://github.com/cube-js/cube.js/compare/v1.1.18...v1.2.0) (2025-02-05)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.35.81](https://github.com/cube-js/cube.js/compare/v0.35.80...v0.35.81) (2024-09-12)
+## [1.1.12](https://github.com/cube-js/cube.js/compare/v1.1.11...v1.1.12) (2025-01-09)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-### Bug Fixes
+# [1.0.0](https://github.com/cube-js/cube.js/compare/v0.36.11...v1.0.0) (2024-10-15)
 
-* Updated jsonwebtoken in all packages ([#8282](https://github.com/cube-js/cube.js/issues/8282)) Thanks  [@jlloyd-widen](https://github.com/jlloyd-widen) ! ([ca7c292](https://github.com/cube-js/cube.js/commit/ca7c292e0122be50ac7adc9b9d4910623d19f840))
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.36.4](https://github.com/cube-js/cube.js/compare/v0.36.3...v0.36.4) (2024-09-27)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.36.2](https://github.com/cube-js/cube.js/compare/v0.36.1...v0.36.2) (2024-09-18)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.35.23](https://github.com/cube-js/cube.js/compare/v0.35.22...v0.35.23) (2024-04-25)
+# [0.36.0](https://github.com/cube-js/cube.js/compare/v0.35.81...v0.36.0) (2024-09-13)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.35.81](https://github.com/cube-js/cube.js/compare/v0.35.80...v0.35.81) (2024-09-12)
 
+### Bug Fixes
 
+- Updated jsonwebtoken in all packages ([#8282](https://github.com/cube-js/cube.js/issues/8282)) Thanks [@jlloyd-widen](https://github.com/jlloyd-widen) ! ([ca7c292](https://github.com/cube-js/cube.js/commit/ca7c292e0122be50ac7adc9b9d4910623d19f840))
 
-
-# [0.35.0](https://github.com/cube-js/cube.js/compare/v0.34.62...v0.35.0) (2024-03-14)
+## [0.35.23](https://github.com/cube-js/cube.js/compare/v0.35.22...v0.35.23) (2024-04-25)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+# [0.35.0](https://github.com/cube-js/cube.js/compare/v0.34.62...v0.35.0) (2024-03-14)
 
-
-
+**Note:** Version bump only for package @cubejs-client/vue
 
 ## [0.34.60](https://github.com/cube-js/cube.js/compare/v0.34.59...v0.34.60) (2024-03-02)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.34.37](https://github.com/cube-js/cube.js/compare/v0.34.36...v0.34.37) (2023-12-19)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.34.32](https://github.com/cube-js/cube.js/compare/v0.34.31...v0.34.32) (2023-12-07)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.34.31](https://github.com/cube-js/cube.js/compare/v0.34.30...v0.34.31) (2023-12-07)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.34.27](https://github.com/cube-js/cube.js/compare/v0.34.26...v0.34.27) (2023-11-30)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.34.24](https://github.com/cube-js/cube.js/compare/v0.34.23...v0.34.24) (2023-11-23)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.34.19](https://github.com/cube-js/cube.js/compare/v0.34.18...v0.34.19) (2023-11-11)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.34.9](https://github.com/cube-js/cube.js/compare/v0.34.8...v0.34.9) (2023-10-26)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.34.2](https://github.com/cube-js/cube.js/compare/v0.34.1...v0.34.2) (2023-10-12)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.34.1](https://github.com/cube-js/cube.js/compare/v0.34.0...v0.34.1) (2023-10-09)
 
-
 ### Bug Fixes
 
-* **@cubejs-client/vue:** Do not add time dimension as order member if granularity is set to `none` ([#7165](https://github.com/cube-js/cube.js/issues/7165)) ([1557be6](https://github.com/cube-js/cube.js/commit/1557be6aa5a6a081578c54c48446815d9be37db6))
-
-
-
-
+- **@cubejs-client/vue:** Do not add time dimension as order member if granularity is set to `none` ([#7165](https://github.com/cube-js/cube.js/issues/7165)) ([1557be6](https://github.com/cube-js/cube.js/commit/1557be6aa5a6a081578c54c48446815d9be37db6))
 
 # [0.34.0](https://github.com/cube-js/cube.js/compare/v0.33.65...v0.34.0) (2023-10-03)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.33.65](https://github.com/cube-js/cube.js/compare/v0.33.64...v0.33.65) (2023-10-02)
 
-
 ### Bug Fixes
 
-* **@cubejs-client/vue:** Pivot config can use null from heuristics ([#7167](https://github.com/cube-js/cube.js/issues/7167)) ([e7043bb](https://github.com/cube-js/cube.js/commit/e7043bb41099d2c4477430b96a20c562e1908266))
-
-
-
-
+- **@cubejs-client/vue:** Pivot config can use null from heuristics ([#7167](https://github.com/cube-js/cube.js/issues/7167)) ([e7043bb](https://github.com/cube-js/cube.js/commit/e7043bb41099d2c4477430b96a20c562e1908266))
 
 ## [0.33.59](https://github.com/cube-js/cube.js/compare/v0.33.58...v0.33.59) (2023-09-20)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.33.58](https://github.com/cube-js/cube.js/compare/v0.33.57...v0.33.58) (2023-09-18)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.33.55](https://github.com/cube-js/cube.js/compare/v0.33.54...v0.33.55) (2023-09-12)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.33.47](https://github.com/cube-js/cube.js/compare/v0.33.46...v0.33.47) (2023-08-15)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.33.44](https://github.com/cube-js/cube.js/compare/v0.33.43...v0.33.44) (2023-08-11)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.33.47](https://github.com/cube-js/cube.js/compare/v0.33.46...v0.33.47) (2023-08-15)
+## [0.33.12](https://github.com/cube-js/cube.js/compare/v0.33.11...v0.33.12) (2023-05-22)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+# [0.33.0](https://github.com/cube-js/cube.js/compare/v0.32.31...v0.33.0) (2023-05-02)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.32.30](https://github.com/cube-js/cube.js/compare/v0.32.29...v0.32.30) (2023-04-28)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.33.44](https://github.com/cube-js/cube.js/compare/v0.33.43...v0.33.44) (2023-08-11)
+## [0.32.22](https://github.com/cube-js/cube.js/compare/v0.32.21...v0.32.22) (2023-04-10)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.32.17](https://github.com/cube-js/cube.js/compare/v0.32.16...v0.32.17) (2023-03-29)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.32.12](https://github.com/cube-js/cube.js/compare/v0.32.11...v0.32.12) (2023-03-22)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.33.12](https://github.com/cube-js/cube.js/compare/v0.33.11...v0.33.12) (2023-05-22)
+# [0.32.0](https://github.com/cube-js/cube.js/compare/v0.31.69...v0.32.0) (2023-03-02)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.31.63](https://github.com/cube-js/cube.js/compare/v0.31.62...v0.31.63) (2023-02-20)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.31.46](https://github.com/cube-js/cube.js/compare/v0.31.45...v0.31.46) (2023-01-18)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-# [0.33.0](https://github.com/cube-js/cube.js/compare/v0.32.31...v0.33.0) (2023-05-02)
+## [0.31.35](https://github.com/cube-js/cube.js/compare/v0.31.34...v0.31.35) (2023-01-07)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.31.34](https://github.com/cube-js/cube.js/compare/v0.31.33...v0.31.34) (2023-01-05)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.31.33](https://github.com/cube-js/cube.js/compare/v0.31.32...v0.31.33) (2023-01-03)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.32.30](https://github.com/cube-js/cube.js/compare/v0.32.29...v0.32.30) (2023-04-28)
+## [0.31.30](https://github.com/cube-js/cube.js/compare/v0.31.29...v0.31.30) (2022-12-22)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.31.19](https://github.com/cube-js/cube.js/compare/v0.31.18...v0.31.19) (2022-11-29)
 
+### Bug Fixes
 
+- packages/cubejs-client-vue/package.json to reduce vulnerabilities ([#5361](https://github.com/cube-js/cube.js/issues/5361)) ([effc694](https://github.com/cube-js/cube.js/commit/effc694b29da181899ff74f7f0107eeaa9aaec76))
 
-
-## [0.32.22](https://github.com/cube-js/cube.js/compare/v0.32.21...v0.32.22) (2023-04-10)
+## [0.31.15](https://github.com/cube-js/cube.js/compare/v0.31.14...v0.31.15) (2022-11-17)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.31.13](https://github.com/cube-js/cube.js/compare/v0.31.12...v0.31.13) (2022-11-08)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.31.9](https://github.com/cube-js/cube.js/compare/v0.31.8...v0.31.9) (2022-11-01)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.32.17](https://github.com/cube-js/cube.js/compare/v0.32.16...v0.32.17) (2023-03-29)
+## [0.31.8](https://github.com/cube-js/cube.js/compare/v0.31.7...v0.31.8) (2022-10-30)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+# [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.30.74](https://github.com/cube-js/cube.js/compare/v0.30.73...v0.30.74) (2022-09-20)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.32.12](https://github.com/cube-js/cube.js/compare/v0.32.11...v0.32.12) (2023-03-22)
+## [0.30.64](https://github.com/cube-js/cube.js/compare/v0.30.63...v0.30.64) (2022-09-07)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.30.60](https://github.com/cube-js/cube.js/compare/v0.30.59...v0.30.60) (2022-08-28)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.30.46](https://github.com/cube-js/cube.js/compare/v0.30.45...v0.30.46) (2022-08-10)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-# [0.32.0](https://github.com/cube-js/cube.js/compare/v0.31.69...v0.32.0) (2023-03-02)
+## [0.30.29](https://github.com/cube-js/cube.js/compare/v0.30.28...v0.30.29) (2022-07-01)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.30.27](https://github.com/cube-js/cube.js/compare/v0.30.26...v0.30.27) (2022-06-24)
 
+### Bug Fixes
 
+- **client-vue:** Fix boolean operator in filter without using builderProps ([#4782](https://github.com/cube-js/cube.js/issues/4782)) ([904171e](https://github.com/cube-js/cube.js/commit/904171ee85185f1ba1fcf812ba58ae6bc11b8407))
 
-
-## [0.31.63](https://github.com/cube-js/cube.js/compare/v0.31.62...v0.31.63) (2023-02-20)
+## [0.30.4](https://github.com/cube-js/cube.js/compare/v0.30.3...v0.30.4) (2022-05-20)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+# [0.30.0](https://github.com/cube-js/cube.js/compare/v0.29.57...v0.30.0) (2022-05-11)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-
-
-## [0.31.46](https://github.com/cube-js/cube.js/compare/v0.31.45...v0.31.46) (2023-01-18)
+## [0.29.54](https://github.com/cube-js/cube.js/compare/v0.29.53...v0.29.54) (2022-05-03)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.29.53](https://github.com/cube-js/cube.js/compare/v0.29.52...v0.29.53) (2022-04-29)
 
+### Features
 
+- **client-vue:** boolean filters support ([#4314](https://github.com/cube-js/cube.js/issues/4314)) ([8a3bb3d](https://github.com/cube-js/cube.js/commit/8a3bb3dc8e427c30d2ac0cdd504662087dcf1e19))
 
-
-## [0.31.35](https://github.com/cube-js/cube.js/compare/v0.31.34...v0.31.35) (2023-01-07)
+## [0.29.51](https://github.com/cube-js/cube.js/compare/v0.29.50...v0.29.51) (2022-04-22)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.29.48](https://github.com/cube-js/cube.js/compare/v0.29.47...v0.29.48) (2022-04-14)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.29.43](https://github.com/cube-js/cube.js/compare/v0.29.42...v0.29.43) (2022-04-07)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.31.34](https://github.com/cube-js/cube.js/compare/v0.31.33...v0.31.34) (2023-01-05)
+## [0.29.42](https://github.com/cube-js/cube.js/compare/v0.29.41...v0.29.42) (2022-04-04)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.29.33](https://github.com/cube-js/cube.js/compare/v0.29.32...v0.29.33) (2022-03-17)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.29.29](https://github.com/cube-js/cube.js/compare/v0.29.28...v0.29.29) (2022-03-03)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.31.33](https://github.com/cube-js/cube.js/compare/v0.31.32...v0.31.33) (2023-01-03)
+## [0.29.23](https://github.com/cube-js/cube.js/compare/v0.29.22...v0.29.23) (2022-01-26)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.29.8](https://github.com/cube-js/cube.js/compare/v0.29.7...v0.29.8) (2021-12-21)
 
+### Bug Fixes
 
+- **@cubejs-client/vue:** fix error when executing deletion ([#3806](https://github.com/cube-js/cube.js/issues/3806)) Thanks [@18207680061](https://github.com/18207680061)! ([9d220a8](https://github.com/cube-js/cube.js/commit/9d220a8cf3bf040b51efefb9f74beb5545a89035))
 
-
-## [0.31.30](https://github.com/cube-js/cube.js/compare/v0.31.29...v0.31.30) (2022-12-22)
+## [0.29.5](https://github.com/cube-js/cube.js/compare/v0.29.4...v0.29.5) (2021-12-17)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+# [0.29.0](https://github.com/cube-js/cube.js/compare/v0.28.67...v0.29.0) (2021-12-14)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.28.66](https://github.com/cube-js/cube.js/compare/v0.28.65...v0.28.66) (2021-12-14)
 
+### Bug Fixes
 
-## [0.31.19](https://github.com/cube-js/cube.js/compare/v0.31.18...v0.31.19) (2022-11-29)
+- **client-vue:** add wrapWithQueryRenderer prop ([#3801](https://github.com/cube-js/cube.js/issues/3801)) ([c211e0a](https://github.com/cube-js/cube.js/commit/c211e0a0b1d260167128edf07b725c905f0dc63e))
 
+## [0.28.52](https://github.com/cube-js/cube.js/compare/v0.28.51...v0.28.52) (2021-11-03)
 
-### Bug Fixes
+**Note:** Version bump only for package @cubejs-client/vue
 
-* packages/cubejs-client-vue/package.json to reduce vulnerabilities ([#5361](https://github.com/cube-js/cube.js/issues/5361)) ([effc694](https://github.com/cube-js/cube.js/commit/effc694b29da181899ff74f7f0107eeaa9aaec76))
+## [0.28.45](https://github.com/cube-js/cube.js/compare/v0.28.44...v0.28.45) (2021-10-19)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.28.39](https://github.com/cube-js/cube.js/compare/v0.28.38...v0.28.39) (2021-09-22)
 
+### Bug Fixes
 
+- **@cubejs-client/vue:** catch `dryRun` errors on `query-builder` mount ([#3450](https://github.com/cube-js/cube.js/issues/3450)) ([189491c](https://github.com/cube-js/cube.js/commit/189491c87ac2d3f5e1ddac516d7ab236d6a7c09b))
 
-## [0.31.15](https://github.com/cube-js/cube.js/compare/v0.31.14...v0.31.15) (2022-11-17)
+## [0.28.38](https://github.com/cube-js/cube.js/compare/v0.28.37...v0.28.38) (2021-09-20)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.28.37](https://github.com/cube-js/cube.js/compare/v0.28.36...v0.28.37) (2021-09-17)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.28.35](https://github.com/cube-js/cube.js/compare/v0.28.34...v0.28.35) (2021-09-13)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.31.13](https://github.com/cube-js/cube.js/compare/v0.31.12...v0.31.13) (2022-11-08)
+## [0.28.25](https://github.com/cube-js/cube.js/compare/v0.28.24...v0.28.25) (2021-08-20)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.28.24](https://github.com/cube-js/cube.js/compare/v0.28.23...v0.28.24) (2021-08-19)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.28.17](https://github.com/cube-js/cube.js/compare/v0.28.16...v0.28.17) (2021-08-11)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.31.9](https://github.com/cube-js/cube.js/compare/v0.31.8...v0.31.9) (2022-11-01)
+## [0.28.15](https://github.com/cube-js/cube.js/compare/v0.28.14...v0.28.15) (2021-08-06)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.28.10](https://github.com/cube-js/cube.js/compare/v0.28.9...v0.28.10) (2021-07-30)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.28.9](https://github.com/cube-js/cube.js/compare/v0.28.8...v0.28.9) (2021-07-29)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.31.8](https://github.com/cube-js/cube.js/compare/v0.31.7...v0.31.8) (2022-10-30)
+## [0.28.6](https://github.com/cube-js/cube.js/compare/v0.28.5...v0.28.6) (2021-07-22)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.28.1](https://github.com/cube-js/cube.js/compare/v0.28.0...v0.28.1) (2021-07-19)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+# [0.28.0](https://github.com/cube-js/cube.js/compare/v0.27.53...v0.28.0) (2021-07-17)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-# [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
+## [0.27.51](https://github.com/cube-js/cube.js/compare/v0.27.50...v0.27.51) (2021-07-13)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.27.48](https://github.com/cube-js/cube.js/compare/v0.27.47...v0.27.48) (2021-07-08)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.27.47](https://github.com/cube-js/cube.js/compare/v0.27.46...v0.27.47) (2021-07-06)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.30.74](https://github.com/cube-js/cube.js/compare/v0.30.73...v0.30.74) (2022-09-20)
+## [0.27.41](https://github.com/cube-js/cube.js/compare/v0.27.40...v0.27.41) (2021-06-25)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.27.35](https://github.com/cube-js/cube.js/compare/v0.27.34...v0.27.35) (2021-06-18)
 
+### Bug Fixes
 
+- **@cubejs-client/vue:** support all pivotConfig props ([#2964](https://github.com/cube-js/cube.js/issues/2964)) ([8c13b2b](https://github.com/cube-js/cube.js/commit/8c13b2beb3fe75533a923128859731cab2da4bbc))
 
+### Features
 
-## [0.30.64](https://github.com/cube-js/cube.js/compare/v0.30.63...v0.30.64) (2022-09-07)
+- **@cubejs-client/vue:** support logical operator filters ([#2950](https://github.com/cube-js/cube.js/issues/2950)). Thanks to [@piktur](https://github.com/piktur)! ([1313dad](https://github.com/cube-js/cube.js/commit/1313dad6a1f4b9da7e6ca194415b1a756e715692))
+
+## [0.27.32](https://github.com/cube-js/cube.js/compare/v0.27.31...v0.27.32) (2021-06-12)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.27.31](https://github.com/cube-js/cube.js/compare/v0.27.30...v0.27.31) (2021-06-11)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.27.26](https://github.com/cube-js/cube.js/compare/v0.27.25...v0.27.26) (2021-06-01)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.30.60](https://github.com/cube-js/cube.js/compare/v0.30.59...v0.30.60) (2022-08-28)
+## [0.27.25](https://github.com/cube-js/cube.js/compare/v0.27.24...v0.27.25) (2021-06-01)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.27.24](https://github.com/cube-js/cube.js/compare/v0.27.23...v0.27.24) (2021-05-29)
+
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.27.22](https://github.com/cube-js/cube.js/compare/v0.27.21...v0.27.22) (2021-05-27)
 
+### Features
 
+- **@cubejs-client/vue3:** vue 3 support ([#2827](https://github.com/cube-js/cube.js/issues/2827)) ([6ac2c8c](https://github.com/cube-js/cube.js/commit/6ac2c8c938fee3001f78ef0f8782255799550514))
 
-## [0.30.46](https://github.com/cube-js/cube.js/compare/v0.30.45...v0.30.46) (2022-08-10)
+## [0.27.19](https://github.com/cube-js/cube.js/compare/v0.27.18...v0.27.19) (2021-05-24)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.27.17](https://github.com/cube-js/cube.js/compare/v0.27.16...v0.27.17) (2021-05-22)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.27.15](https://github.com/cube-js/cube.js/compare/v0.27.14...v0.27.15) (2021-05-18)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.30.29](https://github.com/cube-js/cube.js/compare/v0.30.28...v0.30.29) (2022-07-01)
+## [0.27.14](https://github.com/cube-js/cube.js/compare/v0.27.13...v0.27.14) (2021-05-13)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.27.13](https://github.com/cube-js/cube.js/compare/v0.27.12...v0.27.13) (2021-05-13)
 
+### Bug Fixes
 
+- **@cubejs-client/core:** response error handling ([#2703](https://github.com/cube-js/cube.js/issues/2703)) ([de31373](https://github.com/cube-js/cube.js/commit/de31373d9829a6924d7edc04b96464ffa417d920))
 
+## [0.27.6](https://github.com/cube-js/cube.js/compare/v0.27.5...v0.27.6) (2021-05-03)
 
-## [0.30.27](https://github.com/cube-js/cube.js/compare/v0.30.26...v0.30.27) (2022-06-24)
+**Note:** Version bump only for package @cubejs-client/vue
 
-
-### Bug Fixes
-
-* **client-vue:** Fix boolean operator in filter without using builderProps ([#4782](https://github.com/cube-js/cube.js/issues/4782)) ([904171e](https://github.com/cube-js/cube.js/commit/904171ee85185f1ba1fcf812ba58ae6bc11b8407))
-
-
-
-
-
-## [0.30.4](https://github.com/cube-js/cube.js/compare/v0.30.3...v0.30.4) (2022-05-20)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-# [0.30.0](https://github.com/cube-js/cube.js/compare/v0.29.57...v0.30.0) (2022-05-11)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.29.54](https://github.com/cube-js/cube.js/compare/v0.29.53...v0.29.54) (2022-05-03)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.29.53](https://github.com/cube-js/cube.js/compare/v0.29.52...v0.29.53) (2022-04-29)
-
-
-### Features
-
-* **client-vue:** boolean filters support ([#4314](https://github.com/cube-js/cube.js/issues/4314)) ([8a3bb3d](https://github.com/cube-js/cube.js/commit/8a3bb3dc8e427c30d2ac0cdd504662087dcf1e19))
-
-
-
-
-
-## [0.29.51](https://github.com/cube-js/cube.js/compare/v0.29.50...v0.29.51) (2022-04-22)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.29.48](https://github.com/cube-js/cube.js/compare/v0.29.47...v0.29.48) (2022-04-14)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.29.43](https://github.com/cube-js/cube.js/compare/v0.29.42...v0.29.43) (2022-04-07)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.29.42](https://github.com/cube-js/cube.js/compare/v0.29.41...v0.29.42) (2022-04-04)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.29.33](https://github.com/cube-js/cube.js/compare/v0.29.32...v0.29.33) (2022-03-17)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.29.29](https://github.com/cube-js/cube.js/compare/v0.29.28...v0.29.29) (2022-03-03)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.29.23](https://github.com/cube-js/cube.js/compare/v0.29.22...v0.29.23) (2022-01-26)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.29.8](https://github.com/cube-js/cube.js/compare/v0.29.7...v0.29.8) (2021-12-21)
-
-
-### Bug Fixes
-
-* **@cubejs-client/vue:** fix error when executing deletion ([#3806](https://github.com/cube-js/cube.js/issues/3806)) Thanks [@18207680061](https://github.com/18207680061)! ([9d220a8](https://github.com/cube-js/cube.js/commit/9d220a8cf3bf040b51efefb9f74beb5545a89035))
-
-
-
-
-
-## [0.29.5](https://github.com/cube-js/cube.js/compare/v0.29.4...v0.29.5) (2021-12-17)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-# [0.29.0](https://github.com/cube-js/cube.js/compare/v0.28.67...v0.29.0) (2021-12-14)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.28.66](https://github.com/cube-js/cube.js/compare/v0.28.65...v0.28.66) (2021-12-14)
-
-
-### Bug Fixes
-
-* **client-vue:** add wrapWithQueryRenderer prop ([#3801](https://github.com/cube-js/cube.js/issues/3801)) ([c211e0a](https://github.com/cube-js/cube.js/commit/c211e0a0b1d260167128edf07b725c905f0dc63e))
-
-
-
-
-
-## [0.28.52](https://github.com/cube-js/cube.js/compare/v0.28.51...v0.28.52) (2021-11-03)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.28.45](https://github.com/cube-js/cube.js/compare/v0.28.44...v0.28.45) (2021-10-19)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.28.39](https://github.com/cube-js/cube.js/compare/v0.28.38...v0.28.39) (2021-09-22)
-
-
-### Bug Fixes
-
-* **@cubejs-client/vue:** catch `dryRun` errors on `query-builder` mount ([#3450](https://github.com/cube-js/cube.js/issues/3450)) ([189491c](https://github.com/cube-js/cube.js/commit/189491c87ac2d3f5e1ddac516d7ab236d6a7c09b))
-
-
-
-
-
-## [0.28.38](https://github.com/cube-js/cube.js/compare/v0.28.37...v0.28.38) (2021-09-20)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.28.37](https://github.com/cube-js/cube.js/compare/v0.28.36...v0.28.37) (2021-09-17)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.28.35](https://github.com/cube-js/cube.js/compare/v0.28.34...v0.28.35) (2021-09-13)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.28.25](https://github.com/cube-js/cube.js/compare/v0.28.24...v0.28.25) (2021-08-20)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.28.24](https://github.com/cube-js/cube.js/compare/v0.28.23...v0.28.24) (2021-08-19)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.28.17](https://github.com/cube-js/cube.js/compare/v0.28.16...v0.28.17) (2021-08-11)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.28.15](https://github.com/cube-js/cube.js/compare/v0.28.14...v0.28.15) (2021-08-06)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.28.10](https://github.com/cube-js/cube.js/compare/v0.28.9...v0.28.10) (2021-07-30)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.28.9](https://github.com/cube-js/cube.js/compare/v0.28.8...v0.28.9) (2021-07-29)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.28.6](https://github.com/cube-js/cube.js/compare/v0.28.5...v0.28.6) (2021-07-22)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.28.1](https://github.com/cube-js/cube.js/compare/v0.28.0...v0.28.1) (2021-07-19)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-# [0.28.0](https://github.com/cube-js/cube.js/compare/v0.27.53...v0.28.0) (2021-07-17)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.51](https://github.com/cube-js/cube.js/compare/v0.27.50...v0.27.51) (2021-07-13)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.48](https://github.com/cube-js/cube.js/compare/v0.27.47...v0.27.48) (2021-07-08)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.47](https://github.com/cube-js/cube.js/compare/v0.27.46...v0.27.47) (2021-07-06)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.41](https://github.com/cube-js/cube.js/compare/v0.27.40...v0.27.41) (2021-06-25)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.35](https://github.com/cube-js/cube.js/compare/v0.27.34...v0.27.35) (2021-06-18)
-
-
-### Bug Fixes
-
-* **@cubejs-client/vue:** support all pivotConfig props ([#2964](https://github.com/cube-js/cube.js/issues/2964)) ([8c13b2b](https://github.com/cube-js/cube.js/commit/8c13b2beb3fe75533a923128859731cab2da4bbc))
-
-
-### Features
-
-* **@cubejs-client/vue:** support logical operator filters ([#2950](https://github.com/cube-js/cube.js/issues/2950)). Thanks to [@piktur](https://github.com/piktur)! ([1313dad](https://github.com/cube-js/cube.js/commit/1313dad6a1f4b9da7e6ca194415b1a756e715692))
-
-
-
-
-
-## [0.27.32](https://github.com/cube-js/cube.js/compare/v0.27.31...v0.27.32) (2021-06-12)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.31](https://github.com/cube-js/cube.js/compare/v0.27.30...v0.27.31) (2021-06-11)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.26](https://github.com/cube-js/cube.js/compare/v0.27.25...v0.27.26) (2021-06-01)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.25](https://github.com/cube-js/cube.js/compare/v0.27.24...v0.27.25) (2021-06-01)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.24](https://github.com/cube-js/cube.js/compare/v0.27.23...v0.27.24) (2021-05-29)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.22](https://github.com/cube-js/cube.js/compare/v0.27.21...v0.27.22) (2021-05-27)
-
-
-### Features
-
-* **@cubejs-client/vue3:** vue 3 support ([#2827](https://github.com/cube-js/cube.js/issues/2827)) ([6ac2c8c](https://github.com/cube-js/cube.js/commit/6ac2c8c938fee3001f78ef0f8782255799550514))
-
-
-
-
-
-## [0.27.19](https://github.com/cube-js/cube.js/compare/v0.27.18...v0.27.19) (2021-05-24)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.17](https://github.com/cube-js/cube.js/compare/v0.27.16...v0.27.17) (2021-05-22)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.15](https://github.com/cube-js/cube.js/compare/v0.27.14...v0.27.15) (2021-05-18)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.14](https://github.com/cube-js/cube.js/compare/v0.27.13...v0.27.14) (2021-05-13)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.13](https://github.com/cube-js/cube.js/compare/v0.27.12...v0.27.13) (2021-05-13)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** response error handling ([#2703](https://github.com/cube-js/cube.js/issues/2703)) ([de31373](https://github.com/cube-js/cube.js/commit/de31373d9829a6924d7edc04b96464ffa417d920))
-
-
-
-
-
-## [0.27.6](https://github.com/cube-js/cube.js/compare/v0.27.5...v0.27.6) (2021-05-03)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.5](https://github.com/cube-js/cube.js/compare/v0.27.4...v0.27.5) (2021-05-03)
+## [0.27.5](https://github.com/cube-js/cube.js/compare/v0.27.4...v0.27.5) (2021-05-03)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.27.0](https://github.com/cube-js/cube.js/compare/v0.26.104...v0.27.0) (2021-04-26)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.26.102](https://github.com/cube-js/cube.js/compare/v0.26.101...v0.26.102) (2021-04-22)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.26.94](https://github.com/cube-js/cube.js/compare/v0.26.93...v0.26.94) (2021-04-13)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.26.93](https://github.com/cube-js/cube.js/compare/v0.26.92...v0.26.93) (2021-04-12)
 
-
 ### Bug Fixes
 
-* **@cubejs-client/vue:** make query reactive ([#2539](https://github.com/cube-js/cube.js/issues/2539)) ([9bce6ba](https://github.com/cube-js/cube.js/commit/9bce6ba964d71f0cba0e4d4e4e21a973309d77d4))
-
-
-
-
+- **@cubejs-client/vue:** make query reactive ([#2539](https://github.com/cube-js/cube.js/issues/2539)) ([9bce6ba](https://github.com/cube-js/cube.js/commit/9bce6ba964d71f0cba0e4d4e4e21a973309d77d4))
 
 ## [0.26.90](https://github.com/cube-js/cube.js/compare/v0.26.89...v0.26.90) (2021-04-11)
 
-
 ### Bug Fixes
 
-* **@cubejs-client/vue:** error test fix ([9a97e7b](https://github.com/cube-js/cube.js/commit/9a97e7b97b1a300e89051810a421cb686f250faa))
-
-
-
-
+- **@cubejs-client/vue:** error test fix ([9a97e7b](https://github.com/cube-js/cube.js/commit/9a97e7b97b1a300e89051810a421cb686f250faa))
 
 ## [0.26.82](https://github.com/cube-js/cube.js/compare/v0.26.81...v0.26.82) (2021-04-07)
 
-
 ### Features
 
-* **@cubejs-client/playground:** run query button, disable query auto triggering ([#2476](https://github.com/cube-js/cube.js/issues/2476)) ([92a5d45](https://github.com/cube-js/cube.js/commit/92a5d45eca00e88e925e547a12c3f69b05bfafa6))
-
-
-
-
+- **@cubejs-client/playground:** run query button, disable query auto triggering ([#2476](https://github.com/cube-js/cube.js/issues/2476)) ([92a5d45](https://github.com/cube-js/cube.js/commit/92a5d45eca00e88e925e547a12c3f69b05bfafa6))
 
 ## [0.26.73](https://github.com/cube-js/cube.js/compare/v0.26.72...v0.26.73) (2021-04-01)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.26.70](https://github.com/cube-js/cube.js/compare/v0.26.69...v0.26.70) (2021-03-26)
 
-
 ### Features
 
-* Vue chart renderers ([#2428](https://github.com/cube-js/cube.js/issues/2428)) ([bc2cbab](https://github.com/cube-js/cube.js/commit/bc2cbab22fee860cfc846d1207f6a83899198dd8))
-
-
-
-
+- Vue chart renderers ([#2428](https://github.com/cube-js/cube.js/issues/2428)) ([bc2cbab](https://github.com/cube-js/cube.js/commit/bc2cbab22fee860cfc846d1207f6a83899198dd8))
 
 ## [0.26.69](https://github.com/cube-js/cube.js/compare/v0.26.68...v0.26.69) (2021-03-25)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.26.68](https://github.com/cube-js/cube.js/compare/v0.26.67...v0.26.68) (2021-03-25)
 
-
 ### Features
 
-* **@cubejs-client/vue:** query load event ([6045e8f](https://github.com/cube-js/cube.js/commit/6045e8f060b3702512f138b5c571db5deb6448f2))
-
-
-
-
+- **@cubejs-client/vue:** query load event ([6045e8f](https://github.com/cube-js/cube.js/commit/6045e8f060b3702512f138b5c571db5deb6448f2))
 
 ## [0.26.63](https://github.com/cube-js/cube.js/compare/v0.26.62...v0.26.63) (2021-03-22)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.26.61](https://github.com/cube-js/cube.js/compare/v0.26.60...v0.26.61) (2021-03-18)
 
-
 ### Features
 
-* **@cubejs-client/vue:** vue query builder ([#1824](https://github.com/cube-js/cube.js/issues/1824)) ([06ee13f](https://github.com/cube-js/cube.js/commit/06ee13f72ef33372385567ed5e1795087b4f5f53))
-
-
-
-
+- **@cubejs-client/vue:** vue query builder ([#1824](https://github.com/cube-js/cube.js/issues/1824)) ([06ee13f](https://github.com/cube-js/cube.js/commit/06ee13f72ef33372385567ed5e1795087b4f5f53))
 
 ## [0.26.60](https://github.com/cube-js/cube.js/compare/v0.26.59...v0.26.60) (2021-03-16)
 
+### Features
 
-### Features
-
-* **@cubejs-client/playground:** Playground components ([#2329](https://github.com/cube-js/cube.js/issues/2329)) ([489dc12](https://github.com/cube-js/cube.js/commit/489dc12d7e9bfa87bfb3c8ffabf76f238c86a2fe))
-
-
-
-
-
-## [0.26.55](https://github.com/cube-js/cube.js/compare/v0.26.54...v0.26.55) (2021-03-12)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.26.54](https://github.com/cube-js/cube.js/compare/v0.26.53...v0.26.54) (2021-03-12)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.26.53](https://github.com/cube-js/cube.js/compare/v0.26.52...v0.26.53) (2021-03-11)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-# [0.26.0](https://github.com/cube-js/cube.js/compare/v0.25.33...v0.26.0) (2021-02-01)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-# [0.25.0](https://github.com/cube-js/cube.js/compare/v0.24.15...v0.25.0) (2020-12-21)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.24.4](https://github.com/cube-js/cube.js/compare/v0.24.3...v0.24.4) (2020-12-07)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.24.2](https://github.com/cube-js/cube.js/compare/v0.24.1...v0.24.2) (2020-11-27)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-# [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.23.6](https://github.com/cube-js/cube.js/compare/v0.23.5...v0.23.6) (2020-11-02)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-# [0.23.0](https://github.com/cube-js/cube.js/compare/v0.22.4...v0.23.0) (2020-10-28)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-# [0.22.0](https://github.com/cube-js/cube.js/compare/v0.21.2...v0.22.0) (2020-10-20)
-
-
-### Bug Fixes
-
-* **@cubejs-client/vue:** Allow array props on query renderer to allow data blending usage ([#1213](https://github.com/cube-js/cube.js/issues/1213)). Thanks to [@richipargo](https://github.com/richipargo) ([2203a54](https://github.com/cube-js/cube.js/commit/2203a54))
-
-
-
-
+- **@cubejs-client/playground:** Playground components ([#2329](https://github.com/cube-js/cube.js/issues/2329)) ([489dc12](https://github.com/cube-js/cube.js/commit/489dc12d7e9bfa87bfb3c8ffabf76f238c86a2fe))
 
-## [0.21.1](https://github.com/cube-js/cube.js/compare/v0.21.0...v0.21.1) (2020-10-15)
+## [0.26.55](https://github.com/cube-js/cube.js/compare/v0.26.54...v0.26.55) (2021-03-12)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.26.54](https://github.com/cube-js/cube.js/compare/v0.26.53...v0.26.54) (2021-03-12)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.26.53](https://github.com/cube-js/cube.js/compare/v0.26.52...v0.26.53) (2021-03-11)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-# [0.21.0](https://github.com/cube-js/cube.js/compare/v0.20.15...v0.21.0) (2020-10-09)
+# [0.26.0](https://github.com/cube-js/cube.js/compare/v0.25.33...v0.26.0) (2021-02-01)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+# [0.25.0](https://github.com/cube-js/cube.js/compare/v0.24.15...v0.25.0) (2020-12-21)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.24.4](https://github.com/cube-js/cube.js/compare/v0.24.3...v0.24.4) (2020-12-07)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.20.11](https://github.com/cube-js/cube.js/compare/v0.20.10...v0.20.11) (2020-09-28)
+## [0.24.2](https://github.com/cube-js/cube.js/compare/v0.24.1...v0.24.2) (2020-11-27)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+# [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.23.6](https://github.com/cube-js/cube.js/compare/v0.23.5...v0.23.6) (2020-11-02)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.20.9](https://github.com/cube-js/cube.js/compare/v0.20.8...v0.20.9) (2020-09-19)
+# [0.23.0](https://github.com/cube-js/cube.js/compare/v0.22.4...v0.23.0) (2020-10-28)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+# [0.22.0](https://github.com/cube-js/cube.js/compare/v0.21.2...v0.22.0) (2020-10-20)
 
+### Bug Fixes
 
+- **@cubejs-client/vue:** Allow array props on query renderer to allow data blending usage ([#1213](https://github.com/cube-js/cube.js/issues/1213)). Thanks to [@richipargo](https://github.com/richipargo) ([2203a54](https://github.com/cube-js/cube.js/commit/2203a54))
 
-
-## [0.20.6](https://github.com/cube-js/cube.js/compare/v0.20.5...v0.20.6) (2020-09-10)
+## [0.21.1](https://github.com/cube-js/cube.js/compare/v0.21.0...v0.21.1) (2020-10-15)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+# [0.21.0](https://github.com/cube-js/cube.js/compare/v0.20.15...v0.21.0) (2020-10-09)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.20.11](https://github.com/cube-js/cube.js/compare/v0.20.10...v0.20.11) (2020-09-28)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-# [0.20.0](https://github.com/cube-js/cube.js/compare/v0.19.61...v0.20.0) (2020-08-26)
+## [0.20.9](https://github.com/cube-js/cube.js/compare/v0.20.8...v0.20.9) (2020-09-19)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.20.6](https://github.com/cube-js/cube.js/compare/v0.20.5...v0.20.6) (2020-09-10)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+# [0.20.0](https://github.com/cube-js/cube.js/compare/v0.19.61...v0.20.0) (2020-08-26)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
 ## [0.19.51](https://github.com/cube-js/cube.js/compare/v0.19.50...v0.19.51) (2020-07-17)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.19.50](https://github.com/cube-js/cube.js/compare/v0.19.49...v0.19.50) (2020-07-16)
 
-
 ### Bug Fixes
 
-* **cubejs-client-vue:** added deep watch at query props object in Vue QueryBuilder ([#818](https://github.com/cube-js/cube.js/issues/818)) ([32402e6](https://github.com/cube-js/cube.js/commit/32402e6))
-* filter out falsy members ([65b19c9](https://github.com/cube-js/cube.js/commit/65b19c9))
-
+- **cubejs-client-vue:** added deep watch at query props object in Vue QueryBuilder ([#818](https://github.com/cube-js/cube.js/issues/818)) ([32402e6](https://github.com/cube-js/cube.js/commit/32402e6))
+- filter out falsy members ([65b19c9](https://github.com/cube-js/cube.js/commit/65b19c9))
 
 ### Features
 
-* ResultSet serializaion and deserializaion ([#836](https://github.com/cube-js/cube.js/issues/836)) ([80b8d41](https://github.com/cube-js/cube.js/commit/80b8d41))
-
-
-
-
+- ResultSet serializaion and deserializaion ([#836](https://github.com/cube-js/cube.js/issues/836)) ([80b8d41](https://github.com/cube-js/cube.js/commit/80b8d41))
 
 ## [0.19.48](https://github.com/cube-js/cube.js/compare/v0.19.47...v0.19.48) (2020-07-11)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.19.43](https://github.com/cube-js/cube.js/compare/v0.19.42...v0.19.43) (2020-07-04)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.19.42](https://github.com/cube-js/cube.js/compare/v0.19.41...v0.19.42) (2020-07-01)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.19.35](https://github.com/cube-js/cube.js/compare/v0.19.34...v0.19.35) (2020-06-22)
 
-
 ### Bug Fixes
 
-* **cubejs-client-core:** table pivot ([#672](https://github.com/cube-js/cube.js/issues/672)) ([70015f5](https://github.com/cube-js/cube.js/commit/70015f5))
-
-
-
-
+- **cubejs-client-core:** table pivot ([#672](https://github.com/cube-js/cube.js/issues/672)) ([70015f5](https://github.com/cube-js/cube.js/commit/70015f5))
 
 ## [0.19.31](https://github.com/cube-js/cube.js/compare/v0.19.30...v0.19.31) (2020-06-10)
 
-
 ### Features
 
-* Query builder order by ([#685](https://github.com/cube-js/cube.js/issues/685)) ([d3c735b](https://github.com/cube-js/cube.js/commit/d3c735b))
-
-
-
-
+- Query builder order by ([#685](https://github.com/cube-js/cube.js/issues/685)) ([d3c735b](https://github.com/cube-js/cube.js/commit/d3c735b))
 
 ## [0.19.19](https://github.com/cube-js/cube.js/compare/v0.19.18...v0.19.19) (2020-05-15)
 
-
 ### Bug Fixes
 
-* corejs version ([8bef3b2](https://github.com/cube-js/cube.js/commit/8bef3b2))
-* **client-vue:** updateChartType fix ([#644](https://github.com/cube-js/cube.js/issues/644)) ([5c0e79c](https://github.com/cube-js/cube.js/commit/5c0e79c)), closes [#635](https://github.com/cube-js/cube.js/issues/635)
-
-
-
-
+- corejs version ([8bef3b2](https://github.com/cube-js/cube.js/commit/8bef3b2))
+- **client-vue:** updateChartType fix ([#644](https://github.com/cube-js/cube.js/issues/644)) ([5c0e79c](https://github.com/cube-js/cube.js/commit/5c0e79c)), closes [#635](https://github.com/cube-js/cube.js/issues/635)
 
 # [0.19.0](https://github.com/cube-js/cube.js/compare/v0.18.32...v0.19.0) (2020-04-09)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.18.5](https://github.com/cube-js/cube.js/compare/v0.18.4...v0.18.5) (2020-03-15)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.18.4](https://github.com/cube-js/cube.js/compare/v0.18.3...v0.18.4) (2020-03-09)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.18.3](https://github.com/cube-js/cube.js/compare/v0.18.2...v0.18.3) (2020-03-02)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.18.0](https://github.com/cube-js/cube.js/compare/v0.17.10...v0.18.0) (2020-03-01)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.17.10](https://github.com/cube-js/cube.js/compare/v0.17.9...v0.17.10) (2020-02-20)
 
-
 ### Bug Fixes
 
-* Revert "feat: Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378))" ([b21cbe6](https://github.com/cube-js/cube.js/commit/b21cbe6)), closes [#418](https://github.com/cube-js/cube.js/issues/418)
-
-
-
-
+- Revert "feat: Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378))" ([b21cbe6](https://github.com/cube-js/cube.js/commit/b21cbe6)), closes [#418](https://github.com/cube-js/cube.js/issues/418)
 
 ## [0.17.9](https://github.com/cube-js/cube.js/compare/v0.17.8...v0.17.9) (2020-02-18)
 
-
 ### Features
 
-* Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378)) ([cb8d51c](https://github.com/cube-js/cube.js/commit/cb8d51c))
-
-
-
-
+- Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378)) ([cb8d51c](https://github.com/cube-js/cube.js/commit/cb8d51c))
 
 # [0.17.0](https://github.com/cube-js/cube.js/compare/v0.16.0...v0.17.0) (2020-02-04)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.16.0](https://github.com/cube-js/cube.js/compare/v0.15.4...v0.16.0) (2020-02-04)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.15.0](https://github.com/cube-js/cube.js/compare/v0.14.3...v0.15.0) (2020-01-18)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.14.0](https://github.com/cube-js/cube.js/compare/v0.13.12...v0.14.0) (2020-01-16)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.13.12](https://github.com/cube-js/cube.js/compare/v0.13.11...v0.13.12) (2020-01-12)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.13.7](https://github.com/cube-js/cube.js/compare/v0.13.6...v0.13.7) (2019-12-31)
 
-
 ### Bug Fixes
 
-* **client-core:** Uncaught TypeError: cubejs is not a function ([b5c32cd](https://github.com/cube-js/cube.js/commit/b5c32cd))
-
-
-
-
+- **client-core:** Uncaught TypeError: cubejs is not a function ([b5c32cd](https://github.com/cube-js/cube.js/commit/b5c32cd))
 
 # [0.13.0](https://github.com/cube-js/cube.js/compare/v0.12.3...v0.13.0) (2019-12-10)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.12.0](https://github.com/cube-js/cube.js/compare/v0.11.25...v0.12.0) (2019-11-25)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.11.18](https://github.com/cube-js/cube.js/compare/v0.11.17...v0.11.18) (2019-11-09)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.11.16](https://github.com/statsbotco/cubejs-client/compare/v0.11.15...v0.11.16) (2019-11-04)
 
-
 ### Bug Fixes
 
-* **vue:** Error: Invalid query format: "order" is not allowed ([e6a738a](https://github.com/statsbotco/cubejs-client/commit/e6a738a))
-
-
-
-
+- **vue:** Error: Invalid query format: "order" is not allowed ([e6a738a](https://github.com/statsbotco/cubejs-client/commit/e6a738a))
 
 ## [0.11.13](https://github.com/statsbotco/cubejs-client/compare/v0.11.12...v0.11.13) (2019-10-30)
 
-
 ### Features
 
-* **playground:** Static dashboard template ([2458aad](https://github.com/statsbotco/cubejs-client/commit/2458aad))
-
-
-
-
+- **playground:** Static dashboard template ([2458aad](https://github.com/statsbotco/cubejs-client/commit/2458aad))
 
 ## [0.11.9](https://github.com/statsbotco/cubejs-client/compare/v0.11.8...v0.11.9) (2019-10-23)
 
-
 ### Bug Fixes
 
-* Support `apiToken` to be an async function: first request sends incorrect token ([a2d0c77](https://github.com/statsbotco/cubejs-client/commit/a2d0c77))
-
-
-
-
+- Support `apiToken` to be an async function: first request sends incorrect token ([a2d0c77](https://github.com/statsbotco/cubejs-client/commit/a2d0c77))
 
 ## [0.11.7](https://github.com/statsbotco/cubejs-client/compare/v0.11.6...v0.11.7) (2019-10-22)
 
-
 ### Features
 
-* Support `apiToken` to be an async function ([3a3b5f5](https://github.com/statsbotco/cubejs-client/commit/3a3b5f5))
-
-
-
-
+- Support `apiToken` to be an async function ([3a3b5f5](https://github.com/statsbotco/cubejs-client/commit/3a3b5f5))
 
 # [0.11.0](https://github.com/statsbotco/cubejs-client/compare/v0.10.62...v0.11.0) (2019-10-15)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.10.62](https://github.com/statsbotco/cubejs-client/compare/v0.10.61...v0.10.62) (2019-10-11)
 
-
 ### Features
 
-* **vue:** Add order, renewQuery, and reactivity to Vue component ([#229](https://github.com/statsbotco/cubejs-client/issues/229)). Thanks to @TCBroad ([9293f13](https://github.com/statsbotco/cubejs-client/commit/9293f13))
-
-
-
-
+- **vue:** Add order, renewQuery, and reactivity to Vue component ([#229](https://github.com/statsbotco/cubejs-client/issues/229)). Thanks to @TCBroad ([9293f13](https://github.com/statsbotco/cubejs-client/commit/9293f13))
 
 ## [0.10.61](https://github.com/statsbotco/cubejs-client/compare/v0.10.60...v0.10.61) (2019-10-10)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.10.56](https://github.com/statsbotco/cubejs-client/compare/v0.10.55...v0.10.56) (2019-10-04)
 
-
 ### Bug Fixes
 
-* **react:** Evade unnecessary heavy chart renders ([bdcc569](https://github.com/statsbotco/cubejs-client/commit/bdcc569))
-
-
-
-
+- **react:** Evade unnecessary heavy chart renders ([bdcc569](https://github.com/statsbotco/cubejs-client/commit/bdcc569))
 
 ## [0.10.53](https://github.com/statsbotco/cubejs-client/compare/v0.10.52...v0.10.53) (2019-10-02)
 
-
 ### Features
 
-* **client-react:** provide isQueryPresent() as static API method ([59dc5ce](https://github.com/statsbotco/cubejs-client/commit/59dc5ce))
-
-
-
-
+- **client-react:** provide isQueryPresent() as static API method ([59dc5ce](https://github.com/statsbotco/cubejs-client/commit/59dc5ce))
 
 ## [0.10.49](https://github.com/statsbotco/cubejs-client/compare/v0.10.48...v0.10.49) (2019-10-01)
 
-
 ### Bug Fixes
 
-* **client-ngx:** client.ts is missing from the TypeScript compilation ([65a30cf](https://github.com/statsbotco/cubejs-client/commit/65a30cf))
-
-
-
-
+- **client-ngx:** client.ts is missing from the TypeScript compilation ([65a30cf](https://github.com/statsbotco/cubejs-client/commit/65a30cf))
 
 ## [0.10.43](https://github.com/statsbotco/cubejs-client/compare/v0.10.42...v0.10.43) (2019-09-27)
 
-
 ### Features
 
-* Dynamic dashboards ([#218](https://github.com/statsbotco/cubejs-client/issues/218)) ([2c6cdc9](https://github.com/statsbotco/cubejs-client/commit/2c6cdc9))
-
-
-
-
+- Dynamic dashboards ([#218](https://github.com/statsbotco/cubejs-client/issues/218)) ([2c6cdc9](https://github.com/statsbotco/cubejs-client/commit/2c6cdc9))
 
 ## [0.10.41](https://github.com/statsbotco/cubejs-client/compare/v0.10.40...v0.10.41) (2019-09-13)
 
-
 ### Bug Fixes
 
-* support for deep nested watchers on 'QueryRenderer' ([#207](https://github.com/statsbotco/cubejs-client/issues/207)) ([8d3a500](https://github.com/statsbotco/cubejs-client/commit/8d3a500))
-
-
-
-
+- support for deep nested watchers on 'QueryRenderer' ([#207](https://github.com/statsbotco/cubejs-client/issues/207)) ([8d3a500](https://github.com/statsbotco/cubejs-client/commit/8d3a500))
 
 ## [0.10.40](https://github.com/statsbotco/cubejs-client/compare/v0.10.39...v0.10.40) (2019-09-09)
 
-
 ### Bug Fixes
 
-* missed Vue.js build ([1cf22d5](https://github.com/statsbotco/cubejs-client/commit/1cf22d5))
-
-
-
-
+- missed Vue.js build ([1cf22d5](https://github.com/statsbotco/cubejs-client/commit/1cf22d5))
 
 ## [0.10.32](https://github.com/statsbotco/cubejs-client/compare/v0.10.31...v0.10.32) (2019-09-06)
 
-
 ### Features
 
-* vue limit, offset and measure filters support ([#194](https://github.com/statsbotco/cubejs-client/issues/194)) ([33f365a](https://github.com/statsbotco/cubejs-client/commit/33f365a)), closes [#188](https://github.com/statsbotco/cubejs-client/issues/188)
-
-
-
-
+- vue limit, offset and measure filters support ([#194](https://github.com/statsbotco/cubejs-client/issues/194)) ([33f365a](https://github.com/statsbotco/cubejs-client/commit/33f365a)), closes [#188](https://github.com/statsbotco/cubejs-client/issues/188)
 
 ## [0.10.24](https://github.com/statsbotco/cubejs-client/compare/v0.10.23...v0.10.24) (2019-08-16)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.10.17](https://github.com/statsbotco/cubejs-client/compare/v0.10.16...v0.10.17) (2019-07-31)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.10.16](https://github.com/statsbotco/cubejs-client/compare/v0.10.15...v0.10.16) (2019-07-20)
 
-
 ### Features
 
-* Lean more on vue slots for state ([#148](https://github.com/statsbotco/cubejs-client/issues/148)) ([e8af88d](https://github.com/statsbotco/cubejs-client/commit/e8af88d))
-
-
-
-
+- Lean more on vue slots for state ([#148](https://github.com/statsbotco/cubejs-client/issues/148)) ([e8af88d](https://github.com/statsbotco/cubejs-client/commit/e8af88d))
 
 # [0.10.0](https://github.com/statsbotco/cubejs-client/compare/v0.9.24...v0.10.0) (2019-06-21)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.9.0](https://github.com/statsbotco/cubejs-client/compare/v0.8.7...v0.9.0) (2019-05-11)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.8.4](https://github.com/statsbotco/cubejs-client/compare/v0.8.3...v0.8.4) (2019-05-02)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.8.1](https://github.com/statsbotco/cubejs-client/compare/v0.8.0...v0.8.1) (2019-04-30)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.8.0](https://github.com/statsbotco/cubejs-client/compare/v0.7.10...v0.8.0) (2019-04-29)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.7.0](https://github.com/statsbotco/cubejs-client/compare/v0.6.2...v0.7.0) (2019-04-15)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.6.0](https://github.com/statsbotco/cubejs-client/compare/v0.5.2...v0.6.0) (2019-04-09)
 
-
 ### Features
 
-* Vue.js reactivity on query update ([#70](https://github.com/statsbotco/cubejs-client/issues/70)) ([167fdbf](https://github.com/statsbotco/cubejs-client/commit/167fdbf))
-
-
-
-
+- Vue.js reactivity on query update ([#70](https://github.com/statsbotco/cubejs-client/issues/70)) ([167fdbf](https://github.com/statsbotco/cubejs-client/commit/167fdbf))
 
 ## [0.5.1](https://github.com/statsbotco/cubejs-client/compare/v0.5.0...v0.5.1) (2019-04-02)
 
-
 ### Features
 
-* Vue package improvements and docs ([fc38e69](https://github.com/statsbotco/cubejs-client/commit/fc38e69)), closes [#68](https://github.com/statsbotco/cubejs-client/issues/68)
-
-
-
-
+- Vue package improvements and docs ([fc38e69](https://github.com/statsbotco/cubejs-client/commit/fc38e69)), closes [#68](https://github.com/statsbotco/cubejs-client/issues/68)
 
 # [0.5.0](https://github.com/statsbotco/cubejs-client/compare/v0.4.6...v0.5.0) (2019-04-01)
 
-
 ### Features
 
-* add basic vue support ([#65](https://github.com/statsbotco/cubejs-client/issues/65)) ([f45468b](https://github.com/statsbotco/cubejs-client/commit/f45468b))
+- add basic vue support ([#65](https://github.com/statsbotco/cubejs-client/issues/65)) ([f45468b](https://github.com/statsbotco/cubejs-client/commit/f45468b))
diff --git a/packages/cubejs-client-vue/package.json b/packages/cubejs-client-vue/package.json
index 4eb0b8199d..000198f140 100644
--- a/packages/cubejs-client-vue/package.json
+++ b/packages/cubejs-client-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/vue",
-  "version": "1.1.12",
+  "version": "1.2.14",
   "engines": {},
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
     "src"
   ],
   "dependencies": {
-    "@cubejs-client/core": "1.1.12",
+    "@cubejs-client/core": "1.2.14",
     "core-js": "^3.6.5",
     "ramda": "^0.27.2"
   },
diff --git a/packages/cubejs-client-vue3/CHANGELOG.md b/packages/cubejs-client-vue3/CHANGELOG.md
index 890cae95c1..29316a4d84 100644
--- a/packages/cubejs-client-vue3/CHANGELOG.md
+++ b/packages/cubejs-client-vue3/CHANGELOG.md
@@ -3,1521 +3,846 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.1.12](https://github.com/cube-js/cube.js/compare/v1.1.11...v1.1.12) (2025-01-09)
+## [1.2.14](https://github.com/cube-js/cube.js/compare/v1.2.13...v1.2.14) (2025-02-28)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [1.2.13](https://github.com/cube-js/cube.js/compare/v1.2.12...v1.2.13) (2025-02-26)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-
-
-# [1.0.0](https://github.com/cube-js/cube.js/compare/v0.36.11...v1.0.0) (2024-10-15)
+## [1.2.12](https://github.com/cube-js/cube.js/compare/v1.2.11...v1.2.12) (2025-02-26)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [1.2.11](https://github.com/cube-js/cube.js/compare/v1.2.10...v1.2.11) (2025-02-25)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [1.2.10](https://github.com/cube-js/cube.js/compare/v1.2.9...v1.2.10) (2025-02-24)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.36.4](https://github.com/cube-js/cube.js/compare/v0.36.3...v0.36.4) (2024-09-27)
+## [1.2.9](https://github.com/cube-js/cube.js/compare/v1.2.8...v1.2.9) (2025-02-21)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [1.2.8](https://github.com/cube-js/cube.js/compare/v1.2.7...v1.2.8) (2025-02-21)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [1.2.7](https://github.com/cube-js/cube.js/compare/v1.2.6...v1.2.7) (2025-02-20)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.36.2](https://github.com/cube-js/cube.js/compare/v0.36.1...v0.36.2) (2024-09-18)
+## [1.2.6](https://github.com/cube-js/cube.js/compare/v1.2.5...v1.2.6) (2025-02-18)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [1.2.5](https://github.com/cube-js/cube.js/compare/v1.2.4...v1.2.5) (2025-02-13)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [1.2.4](https://github.com/cube-js/cube.js/compare/v1.2.3...v1.2.4) (2025-02-11)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-# [0.36.0](https://github.com/cube-js/cube.js/compare/v0.35.81...v0.36.0) (2024-09-13)
+## [1.2.3](https://github.com/cube-js/cube.js/compare/v1.2.2...v1.2.3) (2025-02-06)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [1.2.2](https://github.com/cube-js/cube.js/compare/v1.2.1...v1.2.2) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [1.2.1](https://github.com/cube-js/cube.js/compare/v1.2.0...v1.2.1) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.35.23](https://github.com/cube-js/cube.js/compare/v0.35.22...v0.35.23) (2024-04-25)
+# [1.2.0](https://github.com/cube-js/cube.js/compare/v1.1.18...v1.2.0) (2025-02-05)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [1.1.12](https://github.com/cube-js/cube.js/compare/v1.1.11...v1.1.12) (2025-01-09)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+# [1.0.0](https://github.com/cube-js/cube.js/compare/v0.36.11...v1.0.0) (2024-10-15)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-# [0.35.0](https://github.com/cube-js/cube.js/compare/v0.34.62...v0.35.0) (2024-03-14)
+## [0.36.4](https://github.com/cube-js/cube.js/compare/v0.36.3...v0.36.4) (2024-09-27)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.36.2](https://github.com/cube-js/cube.js/compare/v0.36.1...v0.36.2) (2024-09-18)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+# [0.36.0](https://github.com/cube-js/cube.js/compare/v0.35.81...v0.36.0) (2024-09-13)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.34.60](https://github.com/cube-js/cube.js/compare/v0.34.59...v0.34.60) (2024-03-02)
+## [0.35.23](https://github.com/cube-js/cube.js/compare/v0.35.22...v0.35.23) (2024-04-25)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+# [0.35.0](https://github.com/cube-js/cube.js/compare/v0.34.62...v0.35.0) (2024-03-14)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.34.60](https://github.com/cube-js/cube.js/compare/v0.34.59...v0.34.60) (2024-03-02)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
 ## [0.34.37](https://github.com/cube-js/cube.js/compare/v0.34.36...v0.34.37) (2023-12-19)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
-
-
-
-
 ## [0.34.32](https://github.com/cube-js/cube.js/compare/v0.34.31...v0.34.32) (2023-12-07)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
-
-
-
-
 ## [0.34.31](https://github.com/cube-js/cube.js/compare/v0.34.30...v0.34.31) (2023-12-07)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
-
-
-
-
 ## [0.34.27](https://github.com/cube-js/cube.js/compare/v0.34.26...v0.34.27) (2023-11-30)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
-
-
-
-
 ## [0.34.24](https://github.com/cube-js/cube.js/compare/v0.34.23...v0.34.24) (2023-11-23)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
-
-
-
-
 ## [0.34.19](https://github.com/cube-js/cube.js/compare/v0.34.18...v0.34.19) (2023-11-11)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
-
-
-
-
 ## [0.34.9](https://github.com/cube-js/cube.js/compare/v0.34.8...v0.34.9) (2023-10-26)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
-
-
-
-
 ## [0.34.2](https://github.com/cube-js/cube.js/compare/v0.34.1...v0.34.2) (2023-10-12)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
-
-
-
-
 ## [0.34.1](https://github.com/cube-js/cube.js/compare/v0.34.0...v0.34.1) (2023-10-09)
 
-
 ### Bug Fixes
 
-* **@cubejs-client/vue:** Do not add time dimension as order member if granularity is set to `none` ([#7165](https://github.com/cube-js/cube.js/issues/7165)) ([1557be6](https://github.com/cube-js/cube.js/commit/1557be6aa5a6a081578c54c48446815d9be37db6))
-
-
-
-
+- **@cubejs-client/vue:** Do not add time dimension as order member if granularity is set to `none` ([#7165](https://github.com/cube-js/cube.js/issues/7165)) ([1557be6](https://github.com/cube-js/cube.js/commit/1557be6aa5a6a081578c54c48446815d9be37db6))
 
 # [0.34.0](https://github.com/cube-js/cube.js/compare/v0.33.65...v0.34.0) (2023-10-03)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
-
-
-
-
 ## [0.33.65](https://github.com/cube-js/cube.js/compare/v0.33.64...v0.33.65) (2023-10-02)
 
-
 ### Bug Fixes
 
-* **@cubejs-client/vue:** Pivot config can use null from heuristics ([#7167](https://github.com/cube-js/cube.js/issues/7167)) ([e7043bb](https://github.com/cube-js/cube.js/commit/e7043bb41099d2c4477430b96a20c562e1908266))
-
-
-
-
+- **@cubejs-client/vue:** Pivot config can use null from heuristics ([#7167](https://github.com/cube-js/cube.js/issues/7167)) ([e7043bb](https://github.com/cube-js/cube.js/commit/e7043bb41099d2c4477430b96a20c562e1908266))
 
 ## [0.33.59](https://github.com/cube-js/cube.js/compare/v0.33.58...v0.33.59) (2023-09-20)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
-
-
-
-
 ## [0.33.58](https://github.com/cube-js/cube.js/compare/v0.33.57...v0.33.58) (2023-09-18)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.33.55](https://github.com/cube-js/cube.js/compare/v0.33.54...v0.33.55) (2023-09-12)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-
-
-## [0.33.55](https://github.com/cube-js/cube.js/compare/v0.33.54...v0.33.55) (2023-09-12)
+## [0.33.47](https://github.com/cube-js/cube.js/compare/v0.33.46...v0.33.47) (2023-08-15)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.33.44](https://github.com/cube-js/cube.js/compare/v0.33.43...v0.33.44) (2023-08-11)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.33.12](https://github.com/cube-js/cube.js/compare/v0.33.11...v0.33.12) (2023-05-22)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.33.47](https://github.com/cube-js/cube.js/compare/v0.33.46...v0.33.47) (2023-08-15)
+# [0.33.0](https://github.com/cube-js/cube.js/compare/v0.32.31...v0.33.0) (2023-05-02)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.32.30](https://github.com/cube-js/cube.js/compare/v0.32.29...v0.32.30) (2023-04-28)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.32.22](https://github.com/cube-js/cube.js/compare/v0.32.21...v0.32.22) (2023-04-10)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.33.44](https://github.com/cube-js/cube.js/compare/v0.33.43...v0.33.44) (2023-08-11)
+## [0.32.17](https://github.com/cube-js/cube.js/compare/v0.32.16...v0.32.17) (2023-03-29)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.32.12](https://github.com/cube-js/cube.js/compare/v0.32.11...v0.32.12) (2023-03-22)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+# [0.32.0](https://github.com/cube-js/cube.js/compare/v0.31.69...v0.32.0) (2023-03-02)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.33.12](https://github.com/cube-js/cube.js/compare/v0.33.11...v0.33.12) (2023-05-22)
+## [0.31.63](https://github.com/cube-js/cube.js/compare/v0.31.62...v0.31.63) (2023-02-20)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.31.46](https://github.com/cube-js/cube.js/compare/v0.31.45...v0.31.46) (2023-01-18)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.31.35](https://github.com/cube-js/cube.js/compare/v0.31.34...v0.31.35) (2023-01-07)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-# [0.33.0](https://github.com/cube-js/cube.js/compare/v0.32.31...v0.33.0) (2023-05-02)
+## [0.31.34](https://github.com/cube-js/cube.js/compare/v0.31.33...v0.31.34) (2023-01-05)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.31.33](https://github.com/cube-js/cube.js/compare/v0.31.32...v0.31.33) (2023-01-03)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.31.30](https://github.com/cube-js/cube.js/compare/v0.31.29...v0.31.30) (2022-12-22)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.32.30](https://github.com/cube-js/cube.js/compare/v0.32.29...v0.32.30) (2023-04-28)
+## [0.31.15](https://github.com/cube-js/cube.js/compare/v0.31.14...v0.31.15) (2022-11-17)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.31.13](https://github.com/cube-js/cube.js/compare/v0.31.12...v0.31.13) (2022-11-08)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.31.9](https://github.com/cube-js/cube.js/compare/v0.31.8...v0.31.9) (2022-11-01)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.32.22](https://github.com/cube-js/cube.js/compare/v0.32.21...v0.32.22) (2023-04-10)
+## [0.31.8](https://github.com/cube-js/cube.js/compare/v0.31.7...v0.31.8) (2022-10-30)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+# [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.30.74](https://github.com/cube-js/cube.js/compare/v0.30.73...v0.30.74) (2022-09-20)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.32.17](https://github.com/cube-js/cube.js/compare/v0.32.16...v0.32.17) (2023-03-29)
+## [0.30.64](https://github.com/cube-js/cube.js/compare/v0.30.63...v0.30.64) (2022-09-07)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.30.60](https://github.com/cube-js/cube.js/compare/v0.30.59...v0.30.60) (2022-08-28)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.30.54](https://github.com/cube-js/cube.js/compare/v0.30.53...v0.30.54) (2022-08-19)
 
+### Bug Fixes
 
-## [0.32.12](https://github.com/cube-js/cube.js/compare/v0.32.11...v0.32.12) (2023-03-22)
+- **@cubejs-client/vue3:** avoid setQuery Vue3 warnings ([#5084](https://github.com/cube-js/cube.js/issues/5084)) ([#5120](https://github.com/cube-js/cube.js/issues/5120)) ([d380da4](https://github.com/cube-js/cube.js/commit/d380da4e2db09c3eccd8d175287db314568638b1))
 
-**Note:** Version bump only for package @cubejs-client/vue3
+### Features
 
+- **@cubejs-client/vue3:** support logical operator filters ([#2950](https://github.com/cube-js/cube.js/issues/2950)) ([#5119](https://github.com/cube-js/cube.js/issues/5119)) ([077bb75](https://github.com/cube-js/cube.js/commit/077bb75ac529bf2c32a1e525ba23724a15733aa1))
 
+## [0.30.46](https://github.com/cube-js/cube.js/compare/v0.30.45...v0.30.46) (2022-08-10)
 
+### Bug Fixes
 
+- **@cubejs-client/vue3:** fix removeOffset warning ([#5082](https://github.com/cube-js/cube.js/issues/5082)) ([#5083](https://github.com/cube-js/cube.js/issues/5083)) ([e1d427b](https://github.com/cube-js/cube.js/commit/e1d427b84aa0b484c9d255b536a4a0b2abab6054))
 
-# [0.32.0](https://github.com/cube-js/cube.js/compare/v0.31.69...v0.32.0) (2023-03-02)
+## [0.30.29](https://github.com/cube-js/cube.js/compare/v0.30.28...v0.30.29) (2022-07-01)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.30.4](https://github.com/cube-js/cube.js/compare/v0.30.3...v0.30.4) (2022-05-20)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+# [0.30.0](https://github.com/cube-js/cube.js/compare/v0.29.57...v0.30.0) (2022-05-11)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.31.63](https://github.com/cube-js/cube.js/compare/v0.31.62...v0.31.63) (2023-02-20)
+## [0.29.54](https://github.com/cube-js/cube.js/compare/v0.29.53...v0.29.54) (2022-05-03)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.29.53](https://github.com/cube-js/cube.js/compare/v0.29.52...v0.29.53) (2022-04-29)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.29.51](https://github.com/cube-js/cube.js/compare/v0.29.50...v0.29.51) (2022-04-22)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.31.46](https://github.com/cube-js/cube.js/compare/v0.31.45...v0.31.46) (2023-01-18)
+## [0.29.48](https://github.com/cube-js/cube.js/compare/v0.29.47...v0.29.48) (2022-04-14)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.29.43](https://github.com/cube-js/cube.js/compare/v0.29.42...v0.29.43) (2022-04-07)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.29.42](https://github.com/cube-js/cube.js/compare/v0.29.41...v0.29.42) (2022-04-04)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.31.35](https://github.com/cube-js/cube.js/compare/v0.31.34...v0.31.35) (2023-01-07)
+## [0.29.33](https://github.com/cube-js/cube.js/compare/v0.29.32...v0.29.33) (2022-03-17)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.29.29](https://github.com/cube-js/cube.js/compare/v0.29.28...v0.29.29) (2022-03-03)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.29.23](https://github.com/cube-js/cube.js/compare/v0.29.22...v0.29.23) (2022-01-26)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.31.34](https://github.com/cube-js/cube.js/compare/v0.31.33...v0.31.34) (2023-01-05)
+## [0.29.8](https://github.com/cube-js/cube.js/compare/v0.29.7...v0.29.8) (2021-12-21)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.29.5](https://github.com/cube-js/cube.js/compare/v0.29.4...v0.29.5) (2021-12-17)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+# [0.29.0](https://github.com/cube-js/cube.js/compare/v0.28.67...v0.29.0) (2021-12-14)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.31.33](https://github.com/cube-js/cube.js/compare/v0.31.32...v0.31.33) (2023-01-03)
+## [0.28.57](https://github.com/cube-js/cube.js/compare/v0.28.56...v0.28.57) (2021-11-16)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.28.52](https://github.com/cube-js/cube.js/compare/v0.28.51...v0.28.52) (2021-11-03)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.28.45](https://github.com/cube-js/cube.js/compare/v0.28.44...v0.28.45) (2021-10-19)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.31.30](https://github.com/cube-js/cube.js/compare/v0.31.29...v0.31.30) (2022-12-22)
+## [0.28.38](https://github.com/cube-js/cube.js/compare/v0.28.37...v0.28.38) (2021-09-20)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.28.37](https://github.com/cube-js/cube.js/compare/v0.28.36...v0.28.37) (2021-09-17)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.28.35](https://github.com/cube-js/cube.js/compare/v0.28.34...v0.28.35) (2021-09-13)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.31.15](https://github.com/cube-js/cube.js/compare/v0.31.14...v0.31.15) (2022-11-17)
+## [0.28.25](https://github.com/cube-js/cube.js/compare/v0.28.24...v0.28.25) (2021-08-20)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.28.24](https://github.com/cube-js/cube.js/compare/v0.28.23...v0.28.24) (2021-08-19)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.28.17](https://github.com/cube-js/cube.js/compare/v0.28.16...v0.28.17) (2021-08-11)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.31.13](https://github.com/cube-js/cube.js/compare/v0.31.12...v0.31.13) (2022-11-08)
+## [0.28.15](https://github.com/cube-js/cube.js/compare/v0.28.14...v0.28.15) (2021-08-06)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.28.10](https://github.com/cube-js/cube.js/compare/v0.28.9...v0.28.10) (2021-07-30)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.28.9](https://github.com/cube-js/cube.js/compare/v0.28.8...v0.28.9) (2021-07-29)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.31.9](https://github.com/cube-js/cube.js/compare/v0.31.8...v0.31.9) (2022-11-01)
+## [0.28.6](https://github.com/cube-js/cube.js/compare/v0.28.5...v0.28.6) (2021-07-22)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.28.1](https://github.com/cube-js/cube.js/compare/v0.28.0...v0.28.1) (2021-07-19)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+# [0.28.0](https://github.com/cube-js/cube.js/compare/v0.27.53...v0.28.0) (2021-07-17)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.31.8](https://github.com/cube-js/cube.js/compare/v0.31.7...v0.31.8) (2022-10-30)
+## [0.27.51](https://github.com/cube-js/cube.js/compare/v0.27.50...v0.27.51) (2021-07-13)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.27.48](https://github.com/cube-js/cube.js/compare/v0.27.47...v0.27.48) (2021-07-08)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.27.47](https://github.com/cube-js/cube.js/compare/v0.27.46...v0.27.47) (2021-07-06)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-# [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
+## [0.27.41](https://github.com/cube-js/cube.js/compare/v0.27.40...v0.27.41) (2021-06-25)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.27.35](https://github.com/cube-js/cube.js/compare/v0.27.34...v0.27.35) (2021-06-18)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.27.32](https://github.com/cube-js/cube.js/compare/v0.27.31...v0.27.32) (2021-06-12)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.30.74](https://github.com/cube-js/cube.js/compare/v0.30.73...v0.30.74) (2022-09-20)
+## [0.27.31](https://github.com/cube-js/cube.js/compare/v0.27.30...v0.27.31) (2021-06-11)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.27.26](https://github.com/cube-js/cube.js/compare/v0.27.25...v0.27.26) (2021-06-01)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.27.25](https://github.com/cube-js/cube.js/compare/v0.27.24...v0.27.25) (2021-06-01)
 
+**Note:** Version bump only for package @cubejs-client/vue3
 
-## [0.30.64](https://github.com/cube-js/cube.js/compare/v0.30.63...v0.30.64) (2022-09-07)
+## [0.27.24](https://github.com/cube-js/cube.js/compare/v0.27.23...v0.27.24) (2021-05-29)
 
 **Note:** Version bump only for package @cubejs-client/vue3
 
+## [0.27.22](https://github.com/cube-js/cube.js/compare/v0.27.21...v0.27.22) (2021-05-27)
 
+### Features
 
+- **@cubejs-client/vue3:** vue 3 support ([#2827](https://github.com/cube-js/cube.js/issues/2827)) ([6ac2c8c](https://github.com/cube-js/cube.js/commit/6ac2c8c938fee3001f78ef0f8782255799550514))
 
+## [0.27.19](https://github.com/cube-js/cube.js/compare/v0.27.18...v0.27.19) (2021-05-24)
 
-## [0.30.60](https://github.com/cube-js/cube.js/compare/v0.30.59...v0.30.60) (2022-08-28)
+**Note:** Version bump only for package @cubejs-client/vue
 
-**Note:** Version bump only for package @cubejs-client/vue3
+## [0.27.17](https://github.com/cube-js/cube.js/compare/v0.27.16...v0.27.17) (2021-05-22)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.27.15](https://github.com/cube-js/cube.js/compare/v0.27.14...v0.27.15) (2021-05-18)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.27.14](https://github.com/cube-js/cube.js/compare/v0.27.13...v0.27.14) (2021-05-13)
 
-## [0.30.54](https://github.com/cube-js/cube.js/compare/v0.30.53...v0.30.54) (2022-08-19)
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.27.13](https://github.com/cube-js/cube.js/compare/v0.27.12...v0.27.13) (2021-05-13)
 
 ### Bug Fixes
 
-* **@cubejs-client/vue3:** avoid setQuery Vue3 warnings ([#5084](https://github.com/cube-js/cube.js/issues/5084)) ([#5120](https://github.com/cube-js/cube.js/issues/5120)) ([d380da4](https://github.com/cube-js/cube.js/commit/d380da4e2db09c3eccd8d175287db314568638b1))
+- **@cubejs-client/core:** response error handling ([#2703](https://github.com/cube-js/cube.js/issues/2703)) ([de31373](https://github.com/cube-js/cube.js/commit/de31373d9829a6924d7edc04b96464ffa417d920))
 
+## [0.27.6](https://github.com/cube-js/cube.js/compare/v0.27.5...v0.27.6) (2021-05-03)
 
-### Features
+**Note:** Version bump only for package @cubejs-client/vue
 
-* **@cubejs-client/vue3:** support logical operator filters ([#2950](https://github.com/cube-js/cube.js/issues/2950)) ([#5119](https://github.com/cube-js/cube.js/issues/5119)) ([077bb75](https://github.com/cube-js/cube.js/commit/077bb75ac529bf2c32a1e525ba23724a15733aa1))
+## [0.27.5](https://github.com/cube-js/cube.js/compare/v0.27.4...v0.27.5) (2021-05-03)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+# [0.27.0](https://github.com/cube-js/cube.js/compare/v0.26.104...v0.27.0) (2021-04-26)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.26.102](https://github.com/cube-js/cube.js/compare/v0.26.101...v0.26.102) (2021-04-22)
 
-## [0.30.46](https://github.com/cube-js/cube.js/compare/v0.30.45...v0.30.46) (2022-08-10)
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.26.94](https://github.com/cube-js/cube.js/compare/v0.26.93...v0.26.94) (2021-04-13)
 
-### Bug Fixes
+**Note:** Version bump only for package @cubejs-client/vue
 
-* **@cubejs-client/vue3:** fix removeOffset warning ([#5082](https://github.com/cube-js/cube.js/issues/5082)) ([#5083](https://github.com/cube-js/cube.js/issues/5083)) ([e1d427b](https://github.com/cube-js/cube.js/commit/e1d427b84aa0b484c9d255b536a4a0b2abab6054))
+## [0.26.93](https://github.com/cube-js/cube.js/compare/v0.26.92...v0.26.93) (2021-04-12)
 
+### Bug Fixes
 
+- **@cubejs-client/vue:** make query reactive ([#2539](https://github.com/cube-js/cube.js/issues/2539)) ([9bce6ba](https://github.com/cube-js/cube.js/commit/9bce6ba964d71f0cba0e4d4e4e21a973309d77d4))
 
+## [0.26.90](https://github.com/cube-js/cube.js/compare/v0.26.89...v0.26.90) (2021-04-11)
 
+### Bug Fixes
 
-## [0.30.29](https://github.com/cube-js/cube.js/compare/v0.30.28...v0.30.29) (2022-07-01)
+- **@cubejs-client/vue:** error test fix ([9a97e7b](https://github.com/cube-js/cube.js/commit/9a97e7b97b1a300e89051810a421cb686f250faa))
 
-**Note:** Version bump only for package @cubejs-client/vue3
+## [0.26.82](https://github.com/cube-js/cube.js/compare/v0.26.81...v0.26.82) (2021-04-07)
 
+### Features
 
+- **@cubejs-client/playground:** run query button, disable query auto triggering ([#2476](https://github.com/cube-js/cube.js/issues/2476)) ([92a5d45](https://github.com/cube-js/cube.js/commit/92a5d45eca00e88e925e547a12c3f69b05bfafa6))
 
-
-
-## [0.30.4](https://github.com/cube-js/cube.js/compare/v0.30.3...v0.30.4) (2022-05-20)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-# [0.30.0](https://github.com/cube-js/cube.js/compare/v0.29.57...v0.30.0) (2022-05-11)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.29.54](https://github.com/cube-js/cube.js/compare/v0.29.53...v0.29.54) (2022-05-03)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.29.53](https://github.com/cube-js/cube.js/compare/v0.29.52...v0.29.53) (2022-04-29)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.29.51](https://github.com/cube-js/cube.js/compare/v0.29.50...v0.29.51) (2022-04-22)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.29.48](https://github.com/cube-js/cube.js/compare/v0.29.47...v0.29.48) (2022-04-14)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.29.43](https://github.com/cube-js/cube.js/compare/v0.29.42...v0.29.43) (2022-04-07)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.29.42](https://github.com/cube-js/cube.js/compare/v0.29.41...v0.29.42) (2022-04-04)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.29.33](https://github.com/cube-js/cube.js/compare/v0.29.32...v0.29.33) (2022-03-17)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.29.29](https://github.com/cube-js/cube.js/compare/v0.29.28...v0.29.29) (2022-03-03)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.29.23](https://github.com/cube-js/cube.js/compare/v0.29.22...v0.29.23) (2022-01-26)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.29.8](https://github.com/cube-js/cube.js/compare/v0.29.7...v0.29.8) (2021-12-21)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.29.5](https://github.com/cube-js/cube.js/compare/v0.29.4...v0.29.5) (2021-12-17)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-# [0.29.0](https://github.com/cube-js/cube.js/compare/v0.28.67...v0.29.0) (2021-12-14)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.28.57](https://github.com/cube-js/cube.js/compare/v0.28.56...v0.28.57) (2021-11-16)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.28.52](https://github.com/cube-js/cube.js/compare/v0.28.51...v0.28.52) (2021-11-03)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.28.45](https://github.com/cube-js/cube.js/compare/v0.28.44...v0.28.45) (2021-10-19)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.28.38](https://github.com/cube-js/cube.js/compare/v0.28.37...v0.28.38) (2021-09-20)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.28.37](https://github.com/cube-js/cube.js/compare/v0.28.36...v0.28.37) (2021-09-17)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.28.35](https://github.com/cube-js/cube.js/compare/v0.28.34...v0.28.35) (2021-09-13)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.28.25](https://github.com/cube-js/cube.js/compare/v0.28.24...v0.28.25) (2021-08-20)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.28.24](https://github.com/cube-js/cube.js/compare/v0.28.23...v0.28.24) (2021-08-19)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.28.17](https://github.com/cube-js/cube.js/compare/v0.28.16...v0.28.17) (2021-08-11)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.28.15](https://github.com/cube-js/cube.js/compare/v0.28.14...v0.28.15) (2021-08-06)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.28.10](https://github.com/cube-js/cube.js/compare/v0.28.9...v0.28.10) (2021-07-30)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.28.9](https://github.com/cube-js/cube.js/compare/v0.28.8...v0.28.9) (2021-07-29)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.28.6](https://github.com/cube-js/cube.js/compare/v0.28.5...v0.28.6) (2021-07-22)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.28.1](https://github.com/cube-js/cube.js/compare/v0.28.0...v0.28.1) (2021-07-19)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-# [0.28.0](https://github.com/cube-js/cube.js/compare/v0.27.53...v0.28.0) (2021-07-17)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.27.51](https://github.com/cube-js/cube.js/compare/v0.27.50...v0.27.51) (2021-07-13)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.27.48](https://github.com/cube-js/cube.js/compare/v0.27.47...v0.27.48) (2021-07-08)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.27.47](https://github.com/cube-js/cube.js/compare/v0.27.46...v0.27.47) (2021-07-06)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.27.41](https://github.com/cube-js/cube.js/compare/v0.27.40...v0.27.41) (2021-06-25)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.27.35](https://github.com/cube-js/cube.js/compare/v0.27.34...v0.27.35) (2021-06-18)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.27.32](https://github.com/cube-js/cube.js/compare/v0.27.31...v0.27.32) (2021-06-12)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.27.31](https://github.com/cube-js/cube.js/compare/v0.27.30...v0.27.31) (2021-06-11)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.27.26](https://github.com/cube-js/cube.js/compare/v0.27.25...v0.27.26) (2021-06-01)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.27.25](https://github.com/cube-js/cube.js/compare/v0.27.24...v0.27.25) (2021-06-01)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.27.24](https://github.com/cube-js/cube.js/compare/v0.27.23...v0.27.24) (2021-05-29)
-
-**Note:** Version bump only for package @cubejs-client/vue3
-
-
-
-
-
-## [0.27.22](https://github.com/cube-js/cube.js/compare/v0.27.21...v0.27.22) (2021-05-27)
-
-
-### Features
-
-* **@cubejs-client/vue3:** vue 3 support ([#2827](https://github.com/cube-js/cube.js/issues/2827)) ([6ac2c8c](https://github.com/cube-js/cube.js/commit/6ac2c8c938fee3001f78ef0f8782255799550514))
-
-
-
-
-
-## [0.27.19](https://github.com/cube-js/cube.js/compare/v0.27.18...v0.27.19) (2021-05-24)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.17](https://github.com/cube-js/cube.js/compare/v0.27.16...v0.27.17) (2021-05-22)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.15](https://github.com/cube-js/cube.js/compare/v0.27.14...v0.27.15) (2021-05-18)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.14](https://github.com/cube-js/cube.js/compare/v0.27.13...v0.27.14) (2021-05-13)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.13](https://github.com/cube-js/cube.js/compare/v0.27.12...v0.27.13) (2021-05-13)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** response error handling ([#2703](https://github.com/cube-js/cube.js/issues/2703)) ([de31373](https://github.com/cube-js/cube.js/commit/de31373d9829a6924d7edc04b96464ffa417d920))
-
-
-
-
-
-## [0.27.6](https://github.com/cube-js/cube.js/compare/v0.27.5...v0.27.6) (2021-05-03)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.27.5](https://github.com/cube-js/cube.js/compare/v0.27.4...v0.27.5) (2021-05-03)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-# [0.27.0](https://github.com/cube-js/cube.js/compare/v0.26.104...v0.27.0) (2021-04-26)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.26.102](https://github.com/cube-js/cube.js/compare/v0.26.101...v0.26.102) (2021-04-22)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.26.94](https://github.com/cube-js/cube.js/compare/v0.26.93...v0.26.94) (2021-04-13)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.26.93](https://github.com/cube-js/cube.js/compare/v0.26.92...v0.26.93) (2021-04-12)
-
-
-### Bug Fixes
-
-* **@cubejs-client/vue:** make query reactive ([#2539](https://github.com/cube-js/cube.js/issues/2539)) ([9bce6ba](https://github.com/cube-js/cube.js/commit/9bce6ba964d71f0cba0e4d4e4e21a973309d77d4))
-
-
-
-
-
-## [0.26.90](https://github.com/cube-js/cube.js/compare/v0.26.89...v0.26.90) (2021-04-11)
-
-
-### Bug Fixes
-
-* **@cubejs-client/vue:** error test fix ([9a97e7b](https://github.com/cube-js/cube.js/commit/9a97e7b97b1a300e89051810a421cb686f250faa))
-
-
-
-
-
-## [0.26.82](https://github.com/cube-js/cube.js/compare/v0.26.81...v0.26.82) (2021-04-07)
-
-
-### Features
-
-* **@cubejs-client/playground:** run query button, disable query auto triggering ([#2476](https://github.com/cube-js/cube.js/issues/2476)) ([92a5d45](https://github.com/cube-js/cube.js/commit/92a5d45eca00e88e925e547a12c3f69b05bfafa6))
-
-
-
-
-
-## [0.26.73](https://github.com/cube-js/cube.js/compare/v0.26.72...v0.26.73) (2021-04-01)
+## [0.26.73](https://github.com/cube-js/cube.js/compare/v0.26.72...v0.26.73) (2021-04-01)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.26.70](https://github.com/cube-js/cube.js/compare/v0.26.69...v0.26.70) (2021-03-26)
 
-
 ### Features
 
-* Vue chart renderers ([#2428](https://github.com/cube-js/cube.js/issues/2428)) ([bc2cbab](https://github.com/cube-js/cube.js/commit/bc2cbab22fee860cfc846d1207f6a83899198dd8))
-
-
-
-
+- Vue chart renderers ([#2428](https://github.com/cube-js/cube.js/issues/2428)) ([bc2cbab](https://github.com/cube-js/cube.js/commit/bc2cbab22fee860cfc846d1207f6a83899198dd8))
 
 ## [0.26.69](https://github.com/cube-js/cube.js/compare/v0.26.68...v0.26.69) (2021-03-25)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.26.68](https://github.com/cube-js/cube.js/compare/v0.26.67...v0.26.68) (2021-03-25)
 
-
 ### Features
 
-* **@cubejs-client/vue:** query load event ([6045e8f](https://github.com/cube-js/cube.js/commit/6045e8f060b3702512f138b5c571db5deb6448f2))
-
-
-
-
+- **@cubejs-client/vue:** query load event ([6045e8f](https://github.com/cube-js/cube.js/commit/6045e8f060b3702512f138b5c571db5deb6448f2))
 
 ## [0.26.63](https://github.com/cube-js/cube.js/compare/v0.26.62...v0.26.63) (2021-03-22)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.26.61](https://github.com/cube-js/cube.js/compare/v0.26.60...v0.26.61) (2021-03-18)
 
-
 ### Features
 
-* **@cubejs-client/vue:** vue query builder ([#1824](https://github.com/cube-js/cube.js/issues/1824)) ([06ee13f](https://github.com/cube-js/cube.js/commit/06ee13f72ef33372385567ed5e1795087b4f5f53))
-
-
-
-
+- **@cubejs-client/vue:** vue query builder ([#1824](https://github.com/cube-js/cube.js/issues/1824)) ([06ee13f](https://github.com/cube-js/cube.js/commit/06ee13f72ef33372385567ed5e1795087b4f5f53))
 
 ## [0.26.60](https://github.com/cube-js/cube.js/compare/v0.26.59...v0.26.60) (2021-03-16)
 
+### Features
 
-### Features
-
-* **@cubejs-client/playground:** Playground components ([#2329](https://github.com/cube-js/cube.js/issues/2329)) ([489dc12](https://github.com/cube-js/cube.js/commit/489dc12d7e9bfa87bfb3c8ffabf76f238c86a2fe))
-
-
-
-
-
-## [0.26.55](https://github.com/cube-js/cube.js/compare/v0.26.54...v0.26.55) (2021-03-12)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.26.54](https://github.com/cube-js/cube.js/compare/v0.26.53...v0.26.54) (2021-03-12)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.26.53](https://github.com/cube-js/cube.js/compare/v0.26.52...v0.26.53) (2021-03-11)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-# [0.26.0](https://github.com/cube-js/cube.js/compare/v0.25.33...v0.26.0) (2021-02-01)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-# [0.25.0](https://github.com/cube-js/cube.js/compare/v0.24.15...v0.25.0) (2020-12-21)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.24.4](https://github.com/cube-js/cube.js/compare/v0.24.3...v0.24.4) (2020-12-07)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.24.2](https://github.com/cube-js/cube.js/compare/v0.24.1...v0.24.2) (2020-11-27)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-# [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-## [0.23.6](https://github.com/cube-js/cube.js/compare/v0.23.5...v0.23.6) (2020-11-02)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-# [0.23.0](https://github.com/cube-js/cube.js/compare/v0.22.4...v0.23.0) (2020-10-28)
-
-**Note:** Version bump only for package @cubejs-client/vue
-
-
-
-
-
-# [0.22.0](https://github.com/cube-js/cube.js/compare/v0.21.2...v0.22.0) (2020-10-20)
-
-
-### Bug Fixes
-
-* **@cubejs-client/vue:** Allow array props on query renderer to allow data blending usage ([#1213](https://github.com/cube-js/cube.js/issues/1213)). Thanks to [@richipargo](https://github.com/richipargo) ([2203a54](https://github.com/cube-js/cube.js/commit/2203a54))
-
-
-
-
+- **@cubejs-client/playground:** Playground components ([#2329](https://github.com/cube-js/cube.js/issues/2329)) ([489dc12](https://github.com/cube-js/cube.js/commit/489dc12d7e9bfa87bfb3c8ffabf76f238c86a2fe))
 
-## [0.21.1](https://github.com/cube-js/cube.js/compare/v0.21.0...v0.21.1) (2020-10-15)
+## [0.26.55](https://github.com/cube-js/cube.js/compare/v0.26.54...v0.26.55) (2021-03-12)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.26.54](https://github.com/cube-js/cube.js/compare/v0.26.53...v0.26.54) (2021-03-12)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.26.53](https://github.com/cube-js/cube.js/compare/v0.26.52...v0.26.53) (2021-03-11)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-# [0.21.0](https://github.com/cube-js/cube.js/compare/v0.20.15...v0.21.0) (2020-10-09)
+# [0.26.0](https://github.com/cube-js/cube.js/compare/v0.25.33...v0.26.0) (2021-02-01)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+# [0.25.0](https://github.com/cube-js/cube.js/compare/v0.24.15...v0.25.0) (2020-12-21)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.24.4](https://github.com/cube-js/cube.js/compare/v0.24.3...v0.24.4) (2020-12-07)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.20.11](https://github.com/cube-js/cube.js/compare/v0.20.10...v0.20.11) (2020-09-28)
+## [0.24.2](https://github.com/cube-js/cube.js/compare/v0.24.1...v0.24.2) (2020-11-27)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+# [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.23.6](https://github.com/cube-js/cube.js/compare/v0.23.5...v0.23.6) (2020-11-02)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-## [0.20.9](https://github.com/cube-js/cube.js/compare/v0.20.8...v0.20.9) (2020-09-19)
+# [0.23.0](https://github.com/cube-js/cube.js/compare/v0.22.4...v0.23.0) (2020-10-28)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+# [0.22.0](https://github.com/cube-js/cube.js/compare/v0.21.2...v0.22.0) (2020-10-20)
 
+### Bug Fixes
 
+- **@cubejs-client/vue:** Allow array props on query renderer to allow data blending usage ([#1213](https://github.com/cube-js/cube.js/issues/1213)). Thanks to [@richipargo](https://github.com/richipargo) ([2203a54](https://github.com/cube-js/cube.js/commit/2203a54))
 
-
-## [0.20.6](https://github.com/cube-js/cube.js/compare/v0.20.5...v0.20.6) (2020-09-10)
+## [0.21.1](https://github.com/cube-js/cube.js/compare/v0.21.0...v0.21.1) (2020-10-15)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+# [0.21.0](https://github.com/cube-js/cube.js/compare/v0.20.15...v0.21.0) (2020-10-09)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+## [0.20.11](https://github.com/cube-js/cube.js/compare/v0.20.10...v0.20.11) (2020-09-28)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
-# [0.20.0](https://github.com/cube-js/cube.js/compare/v0.19.61...v0.20.0) (2020-08-26)
+## [0.20.9](https://github.com/cube-js/cube.js/compare/v0.20.8...v0.20.9) (2020-09-19)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
+## [0.20.6](https://github.com/cube-js/cube.js/compare/v0.20.5...v0.20.6) (2020-09-10)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
+# [0.20.0](https://github.com/cube-js/cube.js/compare/v0.19.61...v0.20.0) (2020-08-26)
 
+**Note:** Version bump only for package @cubejs-client/vue
 
 ## [0.19.51](https://github.com/cube-js/cube.js/compare/v0.19.50...v0.19.51) (2020-07-17)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.19.50](https://github.com/cube-js/cube.js/compare/v0.19.49...v0.19.50) (2020-07-16)
 
-
 ### Bug Fixes
 
-* **cubejs-client-vue:** added deep watch at query props object in Vue QueryBuilder ([#818](https://github.com/cube-js/cube.js/issues/818)) ([32402e6](https://github.com/cube-js/cube.js/commit/32402e6))
-* filter out falsy members ([65b19c9](https://github.com/cube-js/cube.js/commit/65b19c9))
-
+- **cubejs-client-vue:** added deep watch at query props object in Vue QueryBuilder ([#818](https://github.com/cube-js/cube.js/issues/818)) ([32402e6](https://github.com/cube-js/cube.js/commit/32402e6))
+- filter out falsy members ([65b19c9](https://github.com/cube-js/cube.js/commit/65b19c9))
 
 ### Features
 
-* ResultSet serializaion and deserializaion ([#836](https://github.com/cube-js/cube.js/issues/836)) ([80b8d41](https://github.com/cube-js/cube.js/commit/80b8d41))
-
-
-
-
+- ResultSet serializaion and deserializaion ([#836](https://github.com/cube-js/cube.js/issues/836)) ([80b8d41](https://github.com/cube-js/cube.js/commit/80b8d41))
 
 ## [0.19.48](https://github.com/cube-js/cube.js/compare/v0.19.47...v0.19.48) (2020-07-11)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.19.43](https://github.com/cube-js/cube.js/compare/v0.19.42...v0.19.43) (2020-07-04)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.19.42](https://github.com/cube-js/cube.js/compare/v0.19.41...v0.19.42) (2020-07-01)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.19.35](https://github.com/cube-js/cube.js/compare/v0.19.34...v0.19.35) (2020-06-22)
 
-
 ### Bug Fixes
 
-* **cubejs-client-core:** table pivot ([#672](https://github.com/cube-js/cube.js/issues/672)) ([70015f5](https://github.com/cube-js/cube.js/commit/70015f5))
-
-
-
-
+- **cubejs-client-core:** table pivot ([#672](https://github.com/cube-js/cube.js/issues/672)) ([70015f5](https://github.com/cube-js/cube.js/commit/70015f5))
 
 ## [0.19.31](https://github.com/cube-js/cube.js/compare/v0.19.30...v0.19.31) (2020-06-10)
 
-
 ### Features
 
-* Query builder order by ([#685](https://github.com/cube-js/cube.js/issues/685)) ([d3c735b](https://github.com/cube-js/cube.js/commit/d3c735b))
-
-
-
-
+- Query builder order by ([#685](https://github.com/cube-js/cube.js/issues/685)) ([d3c735b](https://github.com/cube-js/cube.js/commit/d3c735b))
 
 ## [0.19.19](https://github.com/cube-js/cube.js/compare/v0.19.18...v0.19.19) (2020-05-15)
 
-
 ### Bug Fixes
 
-* corejs version ([8bef3b2](https://github.com/cube-js/cube.js/commit/8bef3b2))
-* **client-vue:** updateChartType fix ([#644](https://github.com/cube-js/cube.js/issues/644)) ([5c0e79c](https://github.com/cube-js/cube.js/commit/5c0e79c)), closes [#635](https://github.com/cube-js/cube.js/issues/635)
-
-
-
-
+- corejs version ([8bef3b2](https://github.com/cube-js/cube.js/commit/8bef3b2))
+- **client-vue:** updateChartType fix ([#644](https://github.com/cube-js/cube.js/issues/644)) ([5c0e79c](https://github.com/cube-js/cube.js/commit/5c0e79c)), closes [#635](https://github.com/cube-js/cube.js/issues/635)
 
 # [0.19.0](https://github.com/cube-js/cube.js/compare/v0.18.32...v0.19.0) (2020-04-09)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.18.5](https://github.com/cube-js/cube.js/compare/v0.18.4...v0.18.5) (2020-03-15)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.18.4](https://github.com/cube-js/cube.js/compare/v0.18.3...v0.18.4) (2020-03-09)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.18.3](https://github.com/cube-js/cube.js/compare/v0.18.2...v0.18.3) (2020-03-02)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.18.0](https://github.com/cube-js/cube.js/compare/v0.17.10...v0.18.0) (2020-03-01)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.17.10](https://github.com/cube-js/cube.js/compare/v0.17.9...v0.17.10) (2020-02-20)
 
-
 ### Bug Fixes
 
-* Revert "feat: Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378))" ([b21cbe6](https://github.com/cube-js/cube.js/commit/b21cbe6)), closes [#418](https://github.com/cube-js/cube.js/issues/418)
-
-
-
-
+- Revert "feat: Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378))" ([b21cbe6](https://github.com/cube-js/cube.js/commit/b21cbe6)), closes [#418](https://github.com/cube-js/cube.js/issues/418)
 
 ## [0.17.9](https://github.com/cube-js/cube.js/compare/v0.17.8...v0.17.9) (2020-02-18)
 
-
 ### Features
 
-* Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378)) ([cb8d51c](https://github.com/cube-js/cube.js/commit/cb8d51c))
-
-
-
-
+- Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378)) ([cb8d51c](https://github.com/cube-js/cube.js/commit/cb8d51c))
 
 # [0.17.0](https://github.com/cube-js/cube.js/compare/v0.16.0...v0.17.0) (2020-02-04)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.16.0](https://github.com/cube-js/cube.js/compare/v0.15.4...v0.16.0) (2020-02-04)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.15.0](https://github.com/cube-js/cube.js/compare/v0.14.3...v0.15.0) (2020-01-18)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.14.0](https://github.com/cube-js/cube.js/compare/v0.13.12...v0.14.0) (2020-01-16)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.13.12](https://github.com/cube-js/cube.js/compare/v0.13.11...v0.13.12) (2020-01-12)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.13.7](https://github.com/cube-js/cube.js/compare/v0.13.6...v0.13.7) (2019-12-31)
 
-
 ### Bug Fixes
 
-* **client-core:** Uncaught TypeError: cubejs is not a function ([b5c32cd](https://github.com/cube-js/cube.js/commit/b5c32cd))
-
-
-
-
+- **client-core:** Uncaught TypeError: cubejs is not a function ([b5c32cd](https://github.com/cube-js/cube.js/commit/b5c32cd))
 
 # [0.13.0](https://github.com/cube-js/cube.js/compare/v0.12.3...v0.13.0) (2019-12-10)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.12.0](https://github.com/cube-js/cube.js/compare/v0.11.25...v0.12.0) (2019-11-25)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.11.18](https://github.com/cube-js/cube.js/compare/v0.11.17...v0.11.18) (2019-11-09)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.11.16](https://github.com/statsbotco/cubejs-client/compare/v0.11.15...v0.11.16) (2019-11-04)
 
-
 ### Bug Fixes
 
-* **vue:** Error: Invalid query format: "order" is not allowed ([e6a738a](https://github.com/statsbotco/cubejs-client/commit/e6a738a))
-
-
-
-
+- **vue:** Error: Invalid query format: "order" is not allowed ([e6a738a](https://github.com/statsbotco/cubejs-client/commit/e6a738a))
 
 ## [0.11.13](https://github.com/statsbotco/cubejs-client/compare/v0.11.12...v0.11.13) (2019-10-30)
 
-
 ### Features
 
-* **playground:** Static dashboard template ([2458aad](https://github.com/statsbotco/cubejs-client/commit/2458aad))
-
-
-
-
+- **playground:** Static dashboard template ([2458aad](https://github.com/statsbotco/cubejs-client/commit/2458aad))
 
 ## [0.11.9](https://github.com/statsbotco/cubejs-client/compare/v0.11.8...v0.11.9) (2019-10-23)
 
-
 ### Bug Fixes
 
-* Support `apiToken` to be an async function: first request sends incorrect token ([a2d0c77](https://github.com/statsbotco/cubejs-client/commit/a2d0c77))
-
-
-
-
+- Support `apiToken` to be an async function: first request sends incorrect token ([a2d0c77](https://github.com/statsbotco/cubejs-client/commit/a2d0c77))
 
 ## [0.11.7](https://github.com/statsbotco/cubejs-client/compare/v0.11.6...v0.11.7) (2019-10-22)
 
-
 ### Features
 
-* Support `apiToken` to be an async function ([3a3b5f5](https://github.com/statsbotco/cubejs-client/commit/3a3b5f5))
-
-
-
-
+- Support `apiToken` to be an async function ([3a3b5f5](https://github.com/statsbotco/cubejs-client/commit/3a3b5f5))
 
 # [0.11.0](https://github.com/statsbotco/cubejs-client/compare/v0.10.62...v0.11.0) (2019-10-15)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.10.62](https://github.com/statsbotco/cubejs-client/compare/v0.10.61...v0.10.62) (2019-10-11)
 
-
 ### Features
 
-* **vue:** Add order, renewQuery, and reactivity to Vue component ([#229](https://github.com/statsbotco/cubejs-client/issues/229)). Thanks to @TCBroad ([9293f13](https://github.com/statsbotco/cubejs-client/commit/9293f13))
-
-
-
-
+- **vue:** Add order, renewQuery, and reactivity to Vue component ([#229](https://github.com/statsbotco/cubejs-client/issues/229)). Thanks to @TCBroad ([9293f13](https://github.com/statsbotco/cubejs-client/commit/9293f13))
 
 ## [0.10.61](https://github.com/statsbotco/cubejs-client/compare/v0.10.60...v0.10.61) (2019-10-10)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.10.56](https://github.com/statsbotco/cubejs-client/compare/v0.10.55...v0.10.56) (2019-10-04)
 
-
 ### Bug Fixes
 
-* **react:** Evade unnecessary heavy chart renders ([bdcc569](https://github.com/statsbotco/cubejs-client/commit/bdcc569))
-
-
-
-
+- **react:** Evade unnecessary heavy chart renders ([bdcc569](https://github.com/statsbotco/cubejs-client/commit/bdcc569))
 
 ## [0.10.53](https://github.com/statsbotco/cubejs-client/compare/v0.10.52...v0.10.53) (2019-10-02)
 
-
 ### Features
 
-* **client-react:** provide isQueryPresent() as static API method ([59dc5ce](https://github.com/statsbotco/cubejs-client/commit/59dc5ce))
-
-
-
-
+- **client-react:** provide isQueryPresent() as static API method ([59dc5ce](https://github.com/statsbotco/cubejs-client/commit/59dc5ce))
 
 ## [0.10.49](https://github.com/statsbotco/cubejs-client/compare/v0.10.48...v0.10.49) (2019-10-01)
 
-
 ### Bug Fixes
 
-* **client-ngx:** client.ts is missing from the TypeScript compilation ([65a30cf](https://github.com/statsbotco/cubejs-client/commit/65a30cf))
-
-
-
-
+- **client-ngx:** client.ts is missing from the TypeScript compilation ([65a30cf](https://github.com/statsbotco/cubejs-client/commit/65a30cf))
 
 ## [0.10.43](https://github.com/statsbotco/cubejs-client/compare/v0.10.42...v0.10.43) (2019-09-27)
 
-
 ### Features
 
-* Dynamic dashboards ([#218](https://github.com/statsbotco/cubejs-client/issues/218)) ([2c6cdc9](https://github.com/statsbotco/cubejs-client/commit/2c6cdc9))
-
-
-
-
+- Dynamic dashboards ([#218](https://github.com/statsbotco/cubejs-client/issues/218)) ([2c6cdc9](https://github.com/statsbotco/cubejs-client/commit/2c6cdc9))
 
 ## [0.10.41](https://github.com/statsbotco/cubejs-client/compare/v0.10.40...v0.10.41) (2019-09-13)
 
-
 ### Bug Fixes
 
-* support for deep nested watchers on 'QueryRenderer' ([#207](https://github.com/statsbotco/cubejs-client/issues/207)) ([8d3a500](https://github.com/statsbotco/cubejs-client/commit/8d3a500))
-
-
-
-
+- support for deep nested watchers on 'QueryRenderer' ([#207](https://github.com/statsbotco/cubejs-client/issues/207)) ([8d3a500](https://github.com/statsbotco/cubejs-client/commit/8d3a500))
 
 ## [0.10.40](https://github.com/statsbotco/cubejs-client/compare/v0.10.39...v0.10.40) (2019-09-09)
 
-
 ### Bug Fixes
 
-* missed Vue.js build ([1cf22d5](https://github.com/statsbotco/cubejs-client/commit/1cf22d5))
-
-
-
-
+- missed Vue.js build ([1cf22d5](https://github.com/statsbotco/cubejs-client/commit/1cf22d5))
 
 ## [0.10.32](https://github.com/statsbotco/cubejs-client/compare/v0.10.31...v0.10.32) (2019-09-06)
 
-
 ### Features
 
-* vue limit, offset and measure filters support ([#194](https://github.com/statsbotco/cubejs-client/issues/194)) ([33f365a](https://github.com/statsbotco/cubejs-client/commit/33f365a)), closes [#188](https://github.com/statsbotco/cubejs-client/issues/188)
-
-
-
-
+- vue limit, offset and measure filters support ([#194](https://github.com/statsbotco/cubejs-client/issues/194)) ([33f365a](https://github.com/statsbotco/cubejs-client/commit/33f365a)), closes [#188](https://github.com/statsbotco/cubejs-client/issues/188)
 
 ## [0.10.24](https://github.com/statsbotco/cubejs-client/compare/v0.10.23...v0.10.24) (2019-08-16)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.10.17](https://github.com/statsbotco/cubejs-client/compare/v0.10.16...v0.10.17) (2019-07-31)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.10.16](https://github.com/statsbotco/cubejs-client/compare/v0.10.15...v0.10.16) (2019-07-20)
 
-
 ### Features
 
-* Lean more on vue slots for state ([#148](https://github.com/statsbotco/cubejs-client/issues/148)) ([e8af88d](https://github.com/statsbotco/cubejs-client/commit/e8af88d))
-
-
-
-
+- Lean more on vue slots for state ([#148](https://github.com/statsbotco/cubejs-client/issues/148)) ([e8af88d](https://github.com/statsbotco/cubejs-client/commit/e8af88d))
 
 # [0.10.0](https://github.com/statsbotco/cubejs-client/compare/v0.9.24...v0.10.0) (2019-06-21)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.9.0](https://github.com/statsbotco/cubejs-client/compare/v0.8.7...v0.9.0) (2019-05-11)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.8.4](https://github.com/statsbotco/cubejs-client/compare/v0.8.3...v0.8.4) (2019-05-02)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 ## [0.8.1](https://github.com/statsbotco/cubejs-client/compare/v0.8.0...v0.8.1) (2019-04-30)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.8.0](https://github.com/statsbotco/cubejs-client/compare/v0.7.10...v0.8.0) (2019-04-29)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.7.0](https://github.com/statsbotco/cubejs-client/compare/v0.6.2...v0.7.0) (2019-04-15)
 
 **Note:** Version bump only for package @cubejs-client/vue
 
-
-
-
-
 # [0.6.0](https://github.com/statsbotco/cubejs-client/compare/v0.5.2...v0.6.0) (2019-04-09)
 
-
 ### Features
 
-* Vue.js reactivity on query update ([#70](https://github.com/statsbotco/cubejs-client/issues/70)) ([167fdbf](https://github.com/statsbotco/cubejs-client/commit/167fdbf))
-
-
-
-
+- Vue.js reactivity on query update ([#70](https://github.com/statsbotco/cubejs-client/issues/70)) ([167fdbf](https://github.com/statsbotco/cubejs-client/commit/167fdbf))
 
 ## [0.5.1](https://github.com/statsbotco/cubejs-client/compare/v0.5.0...v0.5.1) (2019-04-02)
 
-
 ### Features
 
-* Vue package improvements and docs ([fc38e69](https://github.com/statsbotco/cubejs-client/commit/fc38e69)), closes [#68](https://github.com/statsbotco/cubejs-client/issues/68)
-
-
-
-
+- Vue package improvements and docs ([fc38e69](https://github.com/statsbotco/cubejs-client/commit/fc38e69)), closes [#68](https://github.com/statsbotco/cubejs-client/issues/68)
 
 # [0.5.0](https://github.com/statsbotco/cubejs-client/compare/v0.4.6...v0.5.0) (2019-04-01)
 
-
 ### Features
 
-* add basic vue support ([#65](https://github.com/statsbotco/cubejs-client/issues/65)) ([f45468b](https://github.com/statsbotco/cubejs-client/commit/f45468b))
+- add basic vue support ([#65](https://github.com/statsbotco/cubejs-client/issues/65)) ([f45468b](https://github.com/statsbotco/cubejs-client/commit/f45468b))
diff --git a/packages/cubejs-client-vue3/package.json b/packages/cubejs-client-vue3/package.json
index a012e3bfc5..9c7960ba2a 100644
--- a/packages/cubejs-client-vue3/package.json
+++ b/packages/cubejs-client-vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/vue3",
-  "version": "1.1.12",
+  "version": "1.2.14",
   "engines": {},
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
     "src"
   ],
   "dependencies": {
-    "@cubejs-client/core": "1.1.12",
+    "@cubejs-client/core": "1.2.14",
     "@vue/compiler-sfc": "^3.0.11",
     "core-js": "^3.6.5",
     "flush-promises": "^1.0.2",
diff --git a/packages/cubejs-client-ws-transport/CHANGELOG.md b/packages/cubejs-client-ws-transport/CHANGELOG.md
index ab94e9915b..10a0270c87 100644
--- a/packages/cubejs-client-ws-transport/CHANGELOG.md
+++ b/packages/cubejs-client-ws-transport/CHANGELOG.md
@@ -3,1219 +3,679 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.1.16](https://github.com/cube-js/cube/compare/v1.1.15...v1.1.16) (2025-01-22)
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-### Bug Fixes
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
 
-* **client-ws-transport:** Flush send queue in close() to avoid race ([#9101](https://github.com/cube-js/cube/issues/9101)) ([d9bc147](https://github.com/cube-js/cube/commit/d9bc147a6ae1deb5e554d76c23a8ad0c3f0225a5))
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [1.1.12](https://github.com/cube-js/cube/compare/v1.1.11...v1.1.12) (2025-01-09)
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-# [1.0.0](https://github.com/cube-js/cube/compare/v0.36.11...v1.0.0) (2024-10-15)
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.36.4](https://github.com/cube-js/cube/compare/v0.36.3...v0.36.4) (2024-09-27)
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.36.2](https://github.com/cube-js/cube/compare/v0.36.1...v0.36.2) (2024-09-18)
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [1.1.16](https://github.com/cube-js/cube/compare/v1.1.15...v1.1.16) (2025-01-22)
 
+### Bug Fixes
 
-# [0.36.0](https://github.com/cube-js/cube/compare/v0.35.81...v0.36.0) (2024-09-13)
+- **client-ws-transport:** Flush send queue in close() to avoid race ([#9101](https://github.com/cube-js/cube/issues/9101)) ([d9bc147](https://github.com/cube-js/cube/commit/d9bc147a6ae1deb5e554d76c23a8ad0c3f0225a5))
+
+## [1.1.12](https://github.com/cube-js/cube/compare/v1.1.11...v1.1.12) (2025-01-09)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+# [1.0.0](https://github.com/cube-js/cube/compare/v0.36.11...v1.0.0) (2024-10-15)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.36.4](https://github.com/cube-js/cube/compare/v0.36.3...v0.36.4) (2024-09-27)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.35.23](https://github.com/cube-js/cube/compare/v0.35.22...v0.35.23) (2024-04-25)
+## [0.36.2](https://github.com/cube-js/cube/compare/v0.36.1...v0.36.2) (2024-09-18)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+# [0.36.0](https://github.com/cube-js/cube/compare/v0.35.81...v0.36.0) (2024-09-13)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.35.23](https://github.com/cube-js/cube/compare/v0.35.22...v0.35.23) (2024-04-25)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
 # [0.35.0](https://github.com/cube-js/cube/compare/v0.34.62...v0.35.0) (2024-03-14)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.34.60](https://github.com/cube-js/cube/compare/v0.34.59...v0.34.60) (2024-03-02)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.34.37](https://github.com/cube-js/cube/compare/v0.34.36...v0.34.37) (2023-12-19)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.34.60](https://github.com/cube-js/cube/compare/v0.34.59...v0.34.60) (2024-03-02)
+## [0.34.32](https://github.com/cube-js/cube/compare/v0.34.31...v0.34.32) (2023-12-07)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.34.27](https://github.com/cube-js/cube/compare/v0.34.26...v0.34.27) (2023-11-30)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.34.25](https://github.com/cube-js/cube/compare/v0.34.24...v0.34.25) (2023-11-24)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.34.37](https://github.com/cube-js/cube/compare/v0.34.36...v0.34.37) (2023-12-19)
+## [0.34.24](https://github.com/cube-js/cube/compare/v0.34.23...v0.34.24) (2023-11-23)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.34.19](https://github.com/cube-js/cube/compare/v0.34.18...v0.34.19) (2023-11-11)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.34.14](https://github.com/cube-js/cube/compare/v0.34.13...v0.34.14) (2023-11-05)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.34.32](https://github.com/cube-js/cube/compare/v0.34.31...v0.34.32) (2023-12-07)
+## [0.34.9](https://github.com/cube-js/cube/compare/v0.34.8...v0.34.9) (2023-10-26)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.34.2](https://github.com/cube-js/cube/compare/v0.34.1...v0.34.2) (2023-10-12)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+# [0.34.0](https://github.com/cube-js/cube/compare/v0.33.65...v0.34.0) (2023-10-03)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.34.27](https://github.com/cube-js/cube/compare/v0.34.26...v0.34.27) (2023-11-30)
+## [0.33.59](https://github.com/cube-js/cube/compare/v0.33.58...v0.33.59) (2023-09-20)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.33.58](https://github.com/cube-js/cube/compare/v0.33.57...v0.33.58) (2023-09-18)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.33.55](https://github.com/cube-js/cube/compare/v0.33.54...v0.33.55) (2023-09-12)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.34.25](https://github.com/cube-js/cube/compare/v0.34.24...v0.34.25) (2023-11-24)
+## [0.33.47](https://github.com/cube-js/cube/compare/v0.33.46...v0.33.47) (2023-08-15)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.33.44](https://github.com/cube-js/cube/compare/v0.33.43...v0.33.44) (2023-08-11)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.33.12](https://github.com/cube-js/cube/compare/v0.33.11...v0.33.12) (2023-05-22)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.34.24](https://github.com/cube-js/cube/compare/v0.34.23...v0.34.24) (2023-11-23)
+# [0.33.0](https://github.com/cube-js/cube/compare/v0.32.31...v0.33.0) (2023-05-02)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.32.30](https://github.com/cube-js/cube/compare/v0.32.29...v0.32.30) (2023-04-28)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.32.28](https://github.com/cube-js/cube/compare/v0.32.27...v0.32.28) (2023-04-19)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.34.19](https://github.com/cube-js/cube/compare/v0.34.18...v0.34.19) (2023-11-11)
+## [0.32.22](https://github.com/cube-js/cube/compare/v0.32.21...v0.32.22) (2023-04-10)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.32.17](https://github.com/cube-js/cube/compare/v0.32.16...v0.32.17) (2023-03-29)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.32.12](https://github.com/cube-js/cube/compare/v0.32.11...v0.32.12) (2023-03-22)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.34.14](https://github.com/cube-js/cube/compare/v0.34.13...v0.34.14) (2023-11-05)
+# [0.32.0](https://github.com/cube-js/cube.js/compare/v0.31.69...v0.32.0) (2023-03-02)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.31.63](https://github.com/cube-js/cube.js/compare/v0.31.62...v0.31.63) (2023-02-20)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.31.60](https://github.com/cube-js/cube.js/compare/v0.31.59...v0.31.60) (2023-02-10)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.34.9](https://github.com/cube-js/cube/compare/v0.34.8...v0.34.9) (2023-10-26)
+## [0.31.46](https://github.com/cube-js/cube.js/compare/v0.31.45...v0.31.46) (2023-01-18)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.31.35](https://github.com/cube-js/cube.js/compare/v0.31.34...v0.31.35) (2023-01-07)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.31.34](https://github.com/cube-js/cube.js/compare/v0.31.33...v0.31.34) (2023-01-05)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.34.2](https://github.com/cube-js/cube/compare/v0.34.1...v0.34.2) (2023-10-12)
+## [0.31.33](https://github.com/cube-js/cube.js/compare/v0.31.32...v0.31.33) (2023-01-03)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.31.30](https://github.com/cube-js/cube.js/compare/v0.31.29...v0.31.30) (2022-12-22)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.31.15](https://github.com/cube-js/cube.js/compare/v0.31.14...v0.31.15) (2022-11-17)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-# [0.34.0](https://github.com/cube-js/cube/compare/v0.33.65...v0.34.0) (2023-10-03)
+## [0.31.13](https://github.com/cube-js/cube.js/compare/v0.31.12...v0.31.13) (2022-11-08)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.31.9](https://github.com/cube-js/cube.js/compare/v0.31.8...v0.31.9) (2022-11-01)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.31.8](https://github.com/cube-js/cube.js/compare/v0.31.7...v0.31.8) (2022-10-30)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.33.59](https://github.com/cube-js/cube/compare/v0.33.58...v0.33.59) (2023-09-20)
+# [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.30.74](https://github.com/cube-js/cube.js/compare/v0.30.73...v0.30.74) (2022-09-20)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.30.64](https://github.com/cube-js/cube.js/compare/v0.30.63...v0.30.64) (2022-09-07)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.33.58](https://github.com/cube-js/cube/compare/v0.33.57...v0.33.58) (2023-09-18)
+## [0.30.60](https://github.com/cube-js/cube.js/compare/v0.30.59...v0.30.60) (2022-08-28)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.30.46](https://github.com/cube-js/cube.js/compare/v0.30.45...v0.30.46) (2022-08-10)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.30.29](https://github.com/cube-js/cube.js/compare/v0.30.28...v0.30.29) (2022-07-01)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.33.55](https://github.com/cube-js/cube/compare/v0.33.54...v0.33.55) (2023-09-12)
+## [0.30.27](https://github.com/cube-js/cube.js/compare/v0.30.26...v0.30.27) (2022-06-24)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.30.4](https://github.com/cube-js/cube.js/compare/v0.30.3...v0.30.4) (2022-05-20)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+# [0.30.0](https://github.com/cube-js/cube.js/compare/v0.29.57...v0.30.0) (2022-05-11)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.33.47](https://github.com/cube-js/cube/compare/v0.33.46...v0.33.47) (2023-08-15)
+## [0.29.54](https://github.com/cube-js/cube.js/compare/v0.29.53...v0.29.54) (2022-05-03)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.29.53](https://github.com/cube-js/cube.js/compare/v0.29.52...v0.29.53) (2022-04-29)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.29.51](https://github.com/cube-js/cube.js/compare/v0.29.50...v0.29.51) (2022-04-22)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.33.44](https://github.com/cube-js/cube/compare/v0.33.43...v0.33.44) (2023-08-11)
+## [0.29.48](https://github.com/cube-js/cube.js/compare/v0.29.47...v0.29.48) (2022-04-14)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.29.43](https://github.com/cube-js/cube.js/compare/v0.29.42...v0.29.43) (2022-04-07)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.29.42](https://github.com/cube-js/cube.js/compare/v0.29.41...v0.29.42) (2022-04-04)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.33.12](https://github.com/cube-js/cube/compare/v0.33.11...v0.33.12) (2023-05-22)
+## [0.29.33](https://github.com/cube-js/cube.js/compare/v0.29.32...v0.29.33) (2022-03-17)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.29.29](https://github.com/cube-js/cube.js/compare/v0.29.28...v0.29.29) (2022-03-03)
 
+### Features
 
+- Compact JSON array based response data format support ([#4046](https://github.com/cube-js/cube.js/issues/4046)) ([e74d73c](https://github.com/cube-js/cube.js/commit/e74d73c140f56e71a24c35a5f03e9af63022bced)), closes [#1](https://github.com/cube-js/cube.js/issues/1)
 
-
-# [0.33.0](https://github.com/cube-js/cube/compare/v0.32.31...v0.33.0) (2023-05-02)
+## [0.29.23](https://github.com/cube-js/cube.js/compare/v0.29.22...v0.29.23) (2022-01-26)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.29.21](https://github.com/cube-js/cube.js/compare/v0.29.20...v0.29.21) (2022-01-17)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.29.8](https://github.com/cube-js/cube.js/compare/v0.29.7...v0.29.8) (2021-12-21)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.32.30](https://github.com/cube-js/cube/compare/v0.32.29...v0.32.30) (2023-04-28)
+## [0.29.5](https://github.com/cube-js/cube.js/compare/v0.29.4...v0.29.5) (2021-12-17)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+# [0.29.0](https://github.com/cube-js/cube.js/compare/v0.28.67...v0.29.0) (2021-12-14)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.28.52](https://github.com/cube-js/cube.js/compare/v0.28.51...v0.28.52) (2021-11-03)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.32.28](https://github.com/cube-js/cube/compare/v0.32.27...v0.32.28) (2023-04-19)
+## [0.28.45](https://github.com/cube-js/cube.js/compare/v0.28.44...v0.28.45) (2021-10-19)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.28.38](https://github.com/cube-js/cube.js/compare/v0.28.37...v0.28.38) (2021-09-20)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.28.37](https://github.com/cube-js/cube.js/compare/v0.28.36...v0.28.37) (2021-09-17)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.32.22](https://github.com/cube-js/cube/compare/v0.32.21...v0.32.22) (2023-04-10)
+## [0.28.35](https://github.com/cube-js/cube.js/compare/v0.28.34...v0.28.35) (2021-09-13)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.28.25](https://github.com/cube-js/cube.js/compare/v0.28.24...v0.28.25) (2021-08-20)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.28.24](https://github.com/cube-js/cube.js/compare/v0.28.23...v0.28.24) (2021-08-19)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.32.17](https://github.com/cube-js/cube/compare/v0.32.16...v0.32.17) (2023-03-29)
+## [0.28.22](https://github.com/cube-js/cube.js/compare/v0.28.21...v0.28.22) (2021-08-17)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.28.17](https://github.com/cube-js/cube.js/compare/v0.28.16...v0.28.17) (2021-08-11)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.28.15](https://github.com/cube-js/cube.js/compare/v0.28.14...v0.28.15) (2021-08-06)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.32.12](https://github.com/cube-js/cube/compare/v0.32.11...v0.32.12) (2023-03-22)
+## [0.28.10](https://github.com/cube-js/cube.js/compare/v0.28.9...v0.28.10) (2021-07-30)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.28.9](https://github.com/cube-js/cube.js/compare/v0.28.8...v0.28.9) (2021-07-29)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.28.6](https://github.com/cube-js/cube.js/compare/v0.28.5...v0.28.6) (2021-07-22)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-# [0.32.0](https://github.com/cube-js/cube.js/compare/v0.31.69...v0.32.0) (2023-03-02)
+## [0.28.1](https://github.com/cube-js/cube.js/compare/v0.28.0...v0.28.1) (2021-07-19)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+# [0.28.0](https://github.com/cube-js/cube.js/compare/v0.27.53...v0.28.0) (2021-07-17)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.27.51](https://github.com/cube-js/cube.js/compare/v0.27.50...v0.27.51) (2021-07-13)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.31.63](https://github.com/cube-js/cube.js/compare/v0.31.62...v0.31.63) (2023-02-20)
+## [0.27.48](https://github.com/cube-js/cube.js/compare/v0.27.47...v0.27.48) (2021-07-08)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.27.47](https://github.com/cube-js/cube.js/compare/v0.27.46...v0.27.47) (2021-07-06)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.27.41](https://github.com/cube-js/cube.js/compare/v0.27.40...v0.27.41) (2021-06-25)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.31.60](https://github.com/cube-js/cube.js/compare/v0.31.59...v0.31.60) (2023-02-10)
+## [0.27.35](https://github.com/cube-js/cube.js/compare/v0.27.34...v0.27.35) (2021-06-18)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.27.32](https://github.com/cube-js/cube.js/compare/v0.27.31...v0.27.32) (2021-06-12)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.27.31](https://github.com/cube-js/cube.js/compare/v0.27.30...v0.27.31) (2021-06-11)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.31.46](https://github.com/cube-js/cube.js/compare/v0.31.45...v0.31.46) (2023-01-18)
+## [0.27.26](https://github.com/cube-js/cube.js/compare/v0.27.25...v0.27.26) (2021-06-01)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.27.25](https://github.com/cube-js/cube.js/compare/v0.27.24...v0.27.25) (2021-06-01)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.27.24](https://github.com/cube-js/cube.js/compare/v0.27.23...v0.27.24) (2021-05-29)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.31.35](https://github.com/cube-js/cube.js/compare/v0.31.34...v0.31.35) (2023-01-07)
+## [0.27.22](https://github.com/cube-js/cube.js/compare/v0.27.21...v0.27.22) (2021-05-27)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.27.19](https://github.com/cube-js/cube.js/compare/v0.27.18...v0.27.19) (2021-05-24)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.27.17](https://github.com/cube-js/cube.js/compare/v0.27.16...v0.27.17) (2021-05-22)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.31.34](https://github.com/cube-js/cube.js/compare/v0.31.33...v0.31.34) (2023-01-05)
+## [0.27.15](https://github.com/cube-js/cube.js/compare/v0.27.14...v0.27.15) (2021-05-18)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.27.14](https://github.com/cube-js/cube.js/compare/v0.27.13...v0.27.14) (2021-05-13)
+
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.27.13](https://github.com/cube-js/cube.js/compare/v0.27.12...v0.27.13) (2021-05-13)
 
+### Bug Fixes
 
+- **@cubejs-client/core:** response error handling ([#2703](https://github.com/cube-js/cube.js/issues/2703)) ([de31373](https://github.com/cube-js/cube.js/commit/de31373d9829a6924d7edc04b96464ffa417d920))
 
-## [0.31.33](https://github.com/cube-js/cube.js/compare/v0.31.32...v0.31.33) (2023-01-03)
+## [0.27.6](https://github.com/cube-js/cube.js/compare/v0.27.5...v0.27.6) (2021-05-03)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.27.5](https://github.com/cube-js/cube.js/compare/v0.27.4...v0.27.5) (2021-05-03)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+# [0.27.0](https://github.com/cube-js/cube.js/compare/v0.26.104...v0.27.0) (2021-04-26)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.31.30](https://github.com/cube-js/cube.js/compare/v0.31.29...v0.31.30) (2022-12-22)
+## [0.26.102](https://github.com/cube-js/cube.js/compare/v0.26.101...v0.26.102) (2021-04-22)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.26.98](https://github.com/cube-js/cube.js/compare/v0.26.97...v0.26.98) (2021-04-15)
 
+### Features
 
+- **ws-transport:** Introduce close() method ([47394c1](https://github.com/cube-js/cube.js/commit/47394c195fc7513c664c6e1e35b43a6883924491))
 
-
-## [0.31.15](https://github.com/cube-js/cube.js/compare/v0.31.14...v0.31.15) (2022-11-17)
+## [0.26.94](https://github.com/cube-js/cube.js/compare/v0.26.93...v0.26.94) (2021-04-13)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.26.93](https://github.com/cube-js/cube.js/compare/v0.26.92...v0.26.93) (2021-04-12)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.26.90](https://github.com/cube-js/cube.js/compare/v0.26.89...v0.26.90) (2021-04-11)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.31.13](https://github.com/cube-js/cube.js/compare/v0.31.12...v0.31.13) (2022-11-08)
+## [0.26.82](https://github.com/cube-js/cube.js/compare/v0.26.81...v0.26.82) (2021-04-07)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.26.74](https://github.com/cube-js/cube.js/compare/v0.26.73...v0.26.74) (2021-04-01)
+
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.26.73](https://github.com/cube-js/cube.js/compare/v0.26.72...v0.26.73) (2021-04-01)
 
+### Features
 
+- Introduce ITransportResponse for HttpTransport/WSTransport, fix [#2439](https://github.com/cube-js/cube.js/issues/2439) ([756bcb8](https://github.com/cube-js/cube.js/commit/756bcb8ae9cd6075382c01a88e46415dd7d024b3))
 
-## [0.31.9](https://github.com/cube-js/cube.js/compare/v0.31.8...v0.31.9) (2022-11-01)
+## [0.26.54](https://github.com/cube-js/cube.js/compare/v0.26.53...v0.26.54) (2021-03-12)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.26.53](https://github.com/cube-js/cube.js/compare/v0.26.52...v0.26.53) (2021-03-11)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.26.13](https://github.com/cube-js/cube.js/compare/v0.26.12...v0.26.13) (2021-02-12)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.31.8](https://github.com/cube-js/cube.js/compare/v0.31.7...v0.31.8) (2022-10-30)
+## [0.26.11](https://github.com/cube-js/cube.js/compare/v0.26.10...v0.26.11) (2021-02-10)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+# [0.26.0](https://github.com/cube-js/cube.js/compare/v0.25.33...v0.26.0) (2021-02-01)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+# [0.25.0](https://github.com/cube-js/cube.js/compare/v0.24.15...v0.25.0) (2020-12-21)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-# [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
+## [0.24.5](https://github.com/cube-js/cube.js/compare/v0.24.4...v0.24.5) (2020-12-09)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.24.4](https://github.com/cube-js/cube.js/compare/v0.24.3...v0.24.4) (2020-12-07)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
+## [0.24.3](https://github.com/cube-js/cube.js/compare/v0.24.2...v0.24.3) (2020-12-01)
 
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
-## [0.30.74](https://github.com/cube-js/cube.js/compare/v0.30.73...v0.30.74) (2022-09-20)
+## [0.24.2](https://github.com/cube-js/cube.js/compare/v0.24.1...v0.24.2) (2020-11-27)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
+# [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
 
-
-
-
-## [0.30.64](https://github.com/cube-js/cube.js/compare/v0.30.63...v0.30.64) (2022-09-07)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.30.60](https://github.com/cube-js/cube.js/compare/v0.30.59...v0.30.60) (2022-08-28)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.30.46](https://github.com/cube-js/cube.js/compare/v0.30.45...v0.30.46) (2022-08-10)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.30.29](https://github.com/cube-js/cube.js/compare/v0.30.28...v0.30.29) (2022-07-01)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.30.27](https://github.com/cube-js/cube.js/compare/v0.30.26...v0.30.27) (2022-06-24)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.30.4](https://github.com/cube-js/cube.js/compare/v0.30.3...v0.30.4) (2022-05-20)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-# [0.30.0](https://github.com/cube-js/cube.js/compare/v0.29.57...v0.30.0) (2022-05-11)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.29.54](https://github.com/cube-js/cube.js/compare/v0.29.53...v0.29.54) (2022-05-03)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.29.53](https://github.com/cube-js/cube.js/compare/v0.29.52...v0.29.53) (2022-04-29)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.29.51](https://github.com/cube-js/cube.js/compare/v0.29.50...v0.29.51) (2022-04-22)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.29.48](https://github.com/cube-js/cube.js/compare/v0.29.47...v0.29.48) (2022-04-14)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.29.43](https://github.com/cube-js/cube.js/compare/v0.29.42...v0.29.43) (2022-04-07)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.29.42](https://github.com/cube-js/cube.js/compare/v0.29.41...v0.29.42) (2022-04-04)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.29.33](https://github.com/cube-js/cube.js/compare/v0.29.32...v0.29.33) (2022-03-17)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.29.29](https://github.com/cube-js/cube.js/compare/v0.29.28...v0.29.29) (2022-03-03)
-
-
-### Features
-
-* Compact JSON array based response data format support ([#4046](https://github.com/cube-js/cube.js/issues/4046)) ([e74d73c](https://github.com/cube-js/cube.js/commit/e74d73c140f56e71a24c35a5f03e9af63022bced)), closes [#1](https://github.com/cube-js/cube.js/issues/1)
-
-
-
-
-
-## [0.29.23](https://github.com/cube-js/cube.js/compare/v0.29.22...v0.29.23) (2022-01-26)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.29.21](https://github.com/cube-js/cube.js/compare/v0.29.20...v0.29.21) (2022-01-17)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.29.8](https://github.com/cube-js/cube.js/compare/v0.29.7...v0.29.8) (2021-12-21)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.29.5](https://github.com/cube-js/cube.js/compare/v0.29.4...v0.29.5) (2021-12-17)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-# [0.29.0](https://github.com/cube-js/cube.js/compare/v0.28.67...v0.29.0) (2021-12-14)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.28.52](https://github.com/cube-js/cube.js/compare/v0.28.51...v0.28.52) (2021-11-03)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.28.45](https://github.com/cube-js/cube.js/compare/v0.28.44...v0.28.45) (2021-10-19)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.28.38](https://github.com/cube-js/cube.js/compare/v0.28.37...v0.28.38) (2021-09-20)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.28.37](https://github.com/cube-js/cube.js/compare/v0.28.36...v0.28.37) (2021-09-17)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.28.35](https://github.com/cube-js/cube.js/compare/v0.28.34...v0.28.35) (2021-09-13)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.28.25](https://github.com/cube-js/cube.js/compare/v0.28.24...v0.28.25) (2021-08-20)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.28.24](https://github.com/cube-js/cube.js/compare/v0.28.23...v0.28.24) (2021-08-19)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.28.22](https://github.com/cube-js/cube.js/compare/v0.28.21...v0.28.22) (2021-08-17)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.28.17](https://github.com/cube-js/cube.js/compare/v0.28.16...v0.28.17) (2021-08-11)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.28.15](https://github.com/cube-js/cube.js/compare/v0.28.14...v0.28.15) (2021-08-06)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.28.10](https://github.com/cube-js/cube.js/compare/v0.28.9...v0.28.10) (2021-07-30)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.28.9](https://github.com/cube-js/cube.js/compare/v0.28.8...v0.28.9) (2021-07-29)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.28.6](https://github.com/cube-js/cube.js/compare/v0.28.5...v0.28.6) (2021-07-22)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.28.1](https://github.com/cube-js/cube.js/compare/v0.28.0...v0.28.1) (2021-07-19)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-# [0.28.0](https://github.com/cube-js/cube.js/compare/v0.27.53...v0.28.0) (2021-07-17)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.51](https://github.com/cube-js/cube.js/compare/v0.27.50...v0.27.51) (2021-07-13)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.48](https://github.com/cube-js/cube.js/compare/v0.27.47...v0.27.48) (2021-07-08)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.47](https://github.com/cube-js/cube.js/compare/v0.27.46...v0.27.47) (2021-07-06)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.41](https://github.com/cube-js/cube.js/compare/v0.27.40...v0.27.41) (2021-06-25)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.35](https://github.com/cube-js/cube.js/compare/v0.27.34...v0.27.35) (2021-06-18)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.32](https://github.com/cube-js/cube.js/compare/v0.27.31...v0.27.32) (2021-06-12)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.31](https://github.com/cube-js/cube.js/compare/v0.27.30...v0.27.31) (2021-06-11)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.26](https://github.com/cube-js/cube.js/compare/v0.27.25...v0.27.26) (2021-06-01)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.25](https://github.com/cube-js/cube.js/compare/v0.27.24...v0.27.25) (2021-06-01)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.24](https://github.com/cube-js/cube.js/compare/v0.27.23...v0.27.24) (2021-05-29)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.22](https://github.com/cube-js/cube.js/compare/v0.27.21...v0.27.22) (2021-05-27)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.19](https://github.com/cube-js/cube.js/compare/v0.27.18...v0.27.19) (2021-05-24)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.17](https://github.com/cube-js/cube.js/compare/v0.27.16...v0.27.17) (2021-05-22)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.15](https://github.com/cube-js/cube.js/compare/v0.27.14...v0.27.15) (2021-05-18)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.14](https://github.com/cube-js/cube.js/compare/v0.27.13...v0.27.14) (2021-05-13)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.13](https://github.com/cube-js/cube.js/compare/v0.27.12...v0.27.13) (2021-05-13)
-
-
-### Bug Fixes
-
-* **@cubejs-client/core:** response error handling ([#2703](https://github.com/cube-js/cube.js/issues/2703)) ([de31373](https://github.com/cube-js/cube.js/commit/de31373d9829a6924d7edc04b96464ffa417d920))
-
-
-
-
-
-## [0.27.6](https://github.com/cube-js/cube.js/compare/v0.27.5...v0.27.6) (2021-05-03)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.27.5](https://github.com/cube-js/cube.js/compare/v0.27.4...v0.27.5) (2021-05-03)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-# [0.27.0](https://github.com/cube-js/cube.js/compare/v0.26.104...v0.27.0) (2021-04-26)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.26.102](https://github.com/cube-js/cube.js/compare/v0.26.101...v0.26.102) (2021-04-22)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.26.98](https://github.com/cube-js/cube.js/compare/v0.26.97...v0.26.98) (2021-04-15)
-
-
-### Features
-
-* **ws-transport:** Introduce close() method ([47394c1](https://github.com/cube-js/cube.js/commit/47394c195fc7513c664c6e1e35b43a6883924491))
-
-
-
-
-
-## [0.26.94](https://github.com/cube-js/cube.js/compare/v0.26.93...v0.26.94) (2021-04-13)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.26.93](https://github.com/cube-js/cube.js/compare/v0.26.92...v0.26.93) (2021-04-12)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.26.90](https://github.com/cube-js/cube.js/compare/v0.26.89...v0.26.90) (2021-04-11)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.26.82](https://github.com/cube-js/cube.js/compare/v0.26.81...v0.26.82) (2021-04-07)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.26.74](https://github.com/cube-js/cube.js/compare/v0.26.73...v0.26.74) (2021-04-01)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.26.73](https://github.com/cube-js/cube.js/compare/v0.26.72...v0.26.73) (2021-04-01)
-
-
-### Features
-
-* Introduce ITransportResponse for HttpTransport/WSTransport, fix [#2439](https://github.com/cube-js/cube.js/issues/2439) ([756bcb8](https://github.com/cube-js/cube.js/commit/756bcb8ae9cd6075382c01a88e46415dd7d024b3))
-
-
-
-
-
-## [0.26.54](https://github.com/cube-js/cube.js/compare/v0.26.53...v0.26.54) (2021-03-12)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.26.53](https://github.com/cube-js/cube.js/compare/v0.26.52...v0.26.53) (2021-03-11)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.26.13](https://github.com/cube-js/cube.js/compare/v0.26.12...v0.26.13) (2021-02-12)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.26.11](https://github.com/cube-js/cube.js/compare/v0.26.10...v0.26.11) (2021-02-10)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-# [0.26.0](https://github.com/cube-js/cube.js/compare/v0.25.33...v0.26.0) (2021-02-01)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-# [0.25.0](https://github.com/cube-js/cube.js/compare/v0.24.15...v0.25.0) (2020-12-21)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.24.5](https://github.com/cube-js/cube.js/compare/v0.24.4...v0.24.5) (2020-12-09)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.24.4](https://github.com/cube-js/cube.js/compare/v0.24.3...v0.24.4) (2020-12-07)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.24.3](https://github.com/cube-js/cube.js/compare/v0.24.2...v0.24.3) (2020-12-01)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-## [0.24.2](https://github.com/cube-js/cube.js/compare/v0.24.1...v0.24.2) (2020-11-27)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
-
-# [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
-
-**Note:** Version bump only for package @cubejs-client/ws-transport
-
-
-
-
+**Note:** Version bump only for package @cubejs-client/ws-transport
 
 ## [0.23.11](https://github.com/cube-js/cube.js/compare/v0.23.10...v0.23.11) (2020-11-13)
 
-
 ### Bug Fixes
 
-* **@cubejs-client/ws-transport:** make auth optional ([#1368](https://github.com/cube-js/cube.js/issues/1368)) ([28a07bd](https://github.com/cube-js/cube.js/commit/28a07bdc0e7e506bbc60daa2ad621415c93b54e2))
-
-
-
-
+- **@cubejs-client/ws-transport:** make auth optional ([#1368](https://github.com/cube-js/cube.js/issues/1368)) ([28a07bd](https://github.com/cube-js/cube.js/commit/28a07bdc0e7e506bbc60daa2ad621415c93b54e2))
 
 ## [0.23.8](https://github.com/cube-js/cube.js/compare/v0.23.7...v0.23.8) (2020-11-06)
 
-
 ### Features
 
-* **@cubejs-client/ws-transport:** Move to TypeScript ([#1293](https://github.com/cube-js/cube.js/issues/1293)) ([e7e1100](https://github.com/cube-js/cube.js/commit/e7e1100ee2adc7e1e9f6368c2edc6208a8eea774))
-
-
-
-
+- **@cubejs-client/ws-transport:** Move to TypeScript ([#1293](https://github.com/cube-js/cube.js/issues/1293)) ([e7e1100](https://github.com/cube-js/cube.js/commit/e7e1100ee2adc7e1e9f6368c2edc6208a8eea774))
 
 ## [0.23.6](https://github.com/cube-js/cube.js/compare/v0.23.5...v0.23.6) (2020-11-02)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 # [0.23.0](https://github.com/cube-js/cube.js/compare/v0.22.4...v0.23.0) (2020-10-28)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 # [0.22.0](https://github.com/cube-js/cube.js/compare/v0.21.2...v0.22.0) (2020-10-20)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 ## [0.21.1](https://github.com/cube-js/cube.js/compare/v0.21.0...v0.21.1) (2020-10-15)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 # [0.21.0](https://github.com/cube-js/cube.js/compare/v0.20.15...v0.21.0) (2020-10-09)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 # [0.20.0](https://github.com/cube-js/cube.js/compare/v0.19.61...v0.20.0) (2020-08-26)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 ## [0.19.54](https://github.com/cube-js/cube.js/compare/v0.19.53...v0.19.54) (2020-07-23)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 ## [0.19.43](https://github.com/cube-js/cube.js/compare/v0.19.42...v0.19.43) (2020-07-04)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 ## [0.19.35](https://github.com/cube-js/cube.js/compare/v0.19.34...v0.19.35) (2020-06-22)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 ## [0.19.22](https://github.com/cube-js/cube.js/compare/v0.19.21...v0.19.22) (2020-05-26)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 ## [0.19.19](https://github.com/cube-js/cube.js/compare/v0.19.18...v0.19.19) (2020-05-15)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 # [0.19.0](https://github.com/cube-js/cube.js/compare/v0.18.32...v0.19.0) (2020-04-09)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 ## [0.18.18](https://github.com/cube-js/cube.js/compare/v0.18.17...v0.18.18) (2020-03-28)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 ## [0.18.5](https://github.com/cube-js/cube.js/compare/v0.18.4...v0.18.5) (2020-03-15)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 ## [0.18.4](https://github.com/cube-js/cube.js/compare/v0.18.3...v0.18.4) (2020-03-09)
 
-
 ### Bug Fixes
 
-* Request span for WebSocketTransport is incorrectly set ([54ba5da](https://github.com/cube-js/cube.js/commit/54ba5da))
-
-
-
-
+- Request span for WebSocketTransport is incorrectly set ([54ba5da](https://github.com/cube-js/cube.js/commit/54ba5da))
 
 # [0.18.0](https://github.com/cube-js/cube.js/compare/v0.17.10...v0.18.0) (2020-03-01)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 ## [0.17.10](https://github.com/cube-js/cube.js/compare/v0.17.9...v0.17.10) (2020-02-20)
 
-
 ### Bug Fixes
 
-* Revert "feat: Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378))" ([b21cbe6](https://github.com/cube-js/cube.js/commit/b21cbe6)), closes [#418](https://github.com/cube-js/cube.js/issues/418)
-
-
-
-
+- Revert "feat: Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378))" ([b21cbe6](https://github.com/cube-js/cube.js/commit/b21cbe6)), closes [#418](https://github.com/cube-js/cube.js/issues/418)
 
 ## [0.17.9](https://github.com/cube-js/cube.js/compare/v0.17.8...v0.17.9) (2020-02-18)
 
-
 ### Features
 
-* Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378)) ([cb8d51c](https://github.com/cube-js/cube.js/commit/cb8d51c))
-* Request id trace span ([880f65e](https://github.com/cube-js/cube.js/commit/880f65e))
-
-
-
-
+- Bump corejs ([#378](https://github.com/cube-js/cube.js/issues/378)) ([cb8d51c](https://github.com/cube-js/cube.js/commit/cb8d51c))
+- Request id trace span ([880f65e](https://github.com/cube-js/cube.js/commit/880f65e))
 
 # [0.17.0](https://github.com/cube-js/cube.js/compare/v0.16.0...v0.17.0) (2020-02-04)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 # [0.16.0](https://github.com/cube-js/cube.js/compare/v0.15.4...v0.16.0) (2020-02-04)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 # [0.15.0](https://github.com/cube-js/cube.js/compare/v0.14.3...v0.15.0) (2020-01-18)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 # [0.14.0](https://github.com/cube-js/cube.js/compare/v0.13.12...v0.14.0) (2020-01-16)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 ## [0.13.7](https://github.com/cube-js/cube.js/compare/v0.13.6...v0.13.7) (2019-12-31)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 # [0.13.0](https://github.com/cube-js/cube.js/compare/v0.12.3...v0.13.0) (2019-12-10)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 # [0.12.0](https://github.com/cube-js/cube.js/compare/v0.11.25...v0.12.0) (2019-11-25)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 ## [0.11.18](https://github.com/cube-js/cube.js/compare/v0.11.17...v0.11.18) (2019-11-09)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport
 
-
-
-
-
 ## [0.11.7](https://github.com/statsbotco/cubejs-client/compare/v0.11.6...v0.11.7) (2019-10-22)
 
-
 ### Features
 
-* Support `apiToken` to be an async function ([3a3b5f5](https://github.com/statsbotco/cubejs-client/commit/3a3b5f5))
-
-
-
-
+- Support `apiToken` to be an async function ([3a3b5f5](https://github.com/statsbotco/cubejs-client/commit/3a3b5f5))
 
 # [0.11.0](https://github.com/statsbotco/cubejs-client/compare/v0.10.62...v0.11.0) (2019-10-15)
 
-
 ### Features
 
-* Sockets Preview ([#231](https://github.com/statsbotco/cubejs-client/issues/231)) ([89fc762](https://github.com/statsbotco/cubejs-client/commit/89fc762)), closes [#221](https://github.com/statsbotco/cubejs-client/issues/221)
+- Sockets Preview ([#231](https://github.com/statsbotco/cubejs-client/issues/231)) ([89fc762](https://github.com/statsbotco/cubejs-client/commit/89fc762)), closes [#221](https://github.com/statsbotco/cubejs-client/issues/221)
diff --git a/packages/cubejs-client-ws-transport/package.json b/packages/cubejs-client-ws-transport/package.json
index 2a5cea879b..adfc89dbb6 100644
--- a/packages/cubejs-client-ws-transport/package.json
+++ b/packages/cubejs-client-ws-transport/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/ws-transport",
-  "version": "1.1.16",
+  "version": "1.2.14",
   "engines": {},
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.1.2",
-    "@cubejs-client/core": "1.1.12",
+    "@cubejs-client/core": "1.2.14",
     "core-js": "^3.6.5",
     "isomorphic-ws": "^4.0.1",
     "ws": "^7.3.1"
@@ -34,7 +34,7 @@
     "@babel/core": "^7.3.3",
     "@babel/preset-env": "^7.3.1",
     "@babel/preset-typescript": "^7.12.1",
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/ws": "^7.2.9",
     "babel-jest": "^27",
     "jest": "^27",
diff --git a/packages/cubejs-crate-driver/CHANGELOG.md b/packages/cubejs-crate-driver/CHANGELOG.md
index 2c05a16520..787354be39 100644
--- a/packages/cubejs-crate-driver/CHANGELOG.md
+++ b/packages/cubejs-crate-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/crate-driver
diff --git a/packages/cubejs-crate-driver/package.json b/packages/cubejs-crate-driver/package.json
index 6860d0e20f..32c2496ef7 100644
--- a/packages/cubejs-crate-driver/package.json
+++ b/packages/cubejs-crate-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/crate-driver",
   "description": "Cube.js Crate database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -28,14 +28,14 @@
     "lint:fix": "eslint --fix src/* --ext .ts"
   },
   "dependencies": {
-    "@cubejs-backend/postgres-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/postgres-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "pg": "^8.7.1"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/testing-shared": "1.1.17",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/testing-shared": "1.2.14",
     "testcontainers": "^10.10.4",
     "typescript": "~5.2.2"
   },
diff --git a/packages/cubejs-cubestore-driver/CHANGELOG.md b/packages/cubejs-cubestore-driver/CHANGELOG.md
index 19a5986ae8..3b99e96f80 100644
--- a/packages/cubejs-cubestore-driver/CHANGELOG.md
+++ b/packages/cubejs-cubestore-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Features
diff --git a/packages/cubejs-cubestore-driver/package.json b/packages/cubejs-cubestore-driver/package.json
index 0625f96e92..9cf43fbc66 100644
--- a/packages/cubejs-cubestore-driver/package.json
+++ b/packages/cubejs-cubestore-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/cubestore-driver",
   "description": "Cube Store driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -26,10 +26,10 @@
     "lint:fix": "eslint --fix src/*.ts"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/cubestore": "1.1.17",
-    "@cubejs-backend/native": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/cubestore": "1.2.14",
+    "@cubejs-backend/native": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "csv-write-stream": "^2.0.0",
     "flatbuffers": "23.3.3",
     "fs-extra": "^9.1.0",
@@ -41,7 +41,7 @@
     "ws": "^7.4.3"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/csv-write-stream": "^2.0.0",
     "@types/generic-pool": "^3.1.9",
     "@types/node": "^18",
diff --git a/packages/cubejs-databricks-jdbc-driver/CHANGELOG.md b/packages/cubejs-databricks-jdbc-driver/CHANGELOG.md
index e68b778582..07b06eee44 100644
--- a/packages/cubejs-databricks-jdbc-driver/CHANGELOG.md
+++ b/packages/cubejs-databricks-jdbc-driver/CHANGELOG.md
@@ -3,6 +3,70 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+### Features
+
+- **server-core:** Introduce CUBEJS_REFRESH_WORKER_CONCURRENCY env and update default concurrency settings for drivers ([#9168](https://github.com/cube-js/cube/issues/9168)) ([7ef6282](https://github.com/cube-js/cube/commit/7ef628273905d47996b108862a52dde89b9525e3))
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+### Bug Fixes
+
+- **databricks-jdbc-driver:** Fix extract epoch from timestamp SQL Generation ([#9160](https://github.com/cube-js/cube/issues/9160)) ([9a73857](https://github.com/cube-js/cube/commit/9a73857b4abc5691b44b8a395176a565cdbf1b2a))
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Features
diff --git a/packages/cubejs-databricks-jdbc-driver/package.json b/packages/cubejs-databricks-jdbc-driver/package.json
index eba7007a79..d27f794b15 100644
--- a/packages/cubejs-databricks-jdbc-driver/package.json
+++ b/packages/cubejs-databricks-jdbc-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/databricks-jdbc-driver",
   "description": "Cube.js Databricks database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -30,17 +30,17 @@
     "bin"
   ],
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/jdbc-driver": "1.1.17",
-    "@cubejs-backend/schema-compiler": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/jdbc-driver": "1.2.14",
+    "@cubejs-backend/schema-compiler": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "node-fetch": "^2.6.1",
     "ramda": "^0.27.2",
     "source-map-support": "^0.5.19",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/generic-pool": "^3.1.9",
     "@types/jest": "^27",
     "@types/node": "^18",
diff --git a/packages/cubejs-databricks-jdbc-driver/src/DatabricksDriver.ts b/packages/cubejs-databricks-jdbc-driver/src/DatabricksDriver.ts
index d3754207a3..d79ca9a0ec 100644
--- a/packages/cubejs-databricks-jdbc-driver/src/DatabricksDriver.ts
+++ b/packages/cubejs-databricks-jdbc-driver/src/DatabricksDriver.ts
@@ -147,7 +147,7 @@ export class DatabricksDriver extends JDBCDriver {
    * Returns default concurrency value.
    */
   public static getDefaultConcurrency(): number {
-    return 2;
+    return 10;
   }
 
   /**
diff --git a/packages/cubejs-dbt-schema-extension/CHANGELOG.md b/packages/cubejs-dbt-schema-extension/CHANGELOG.md
index e7b363d92c..bd68a79372 100644
--- a/packages/cubejs-dbt-schema-extension/CHANGELOG.md
+++ b/packages/cubejs-dbt-schema-extension/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
diff --git a/packages/cubejs-dbt-schema-extension/package.json b/packages/cubejs-dbt-schema-extension/package.json
index b5d8074b34..936b82f594 100644
--- a/packages/cubejs-dbt-schema-extension/package.json
+++ b/packages/cubejs-dbt-schema-extension/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/dbt-schema-extension",
   "description": "Cube.js dbt Schema Extension",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -25,14 +25,14 @@
     "lint:fix": "eslint --fix src/* --ext .ts,.js"
   },
   "dependencies": {
-    "@cubejs-backend/schema-compiler": "1.1.17",
+    "@cubejs-backend/schema-compiler": "1.2.14",
     "fs-extra": "^9.1.0",
     "inflection": "^1.12.0",
     "node-fetch": "^2.6.1"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/testing": "1.1.17",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/testing": "1.2.14",
     "@types/generic-pool": "^3.1.9",
     "@types/jest": "^27",
     "jest": "^27",
diff --git a/packages/cubejs-docker/CHANGELOG.md b/packages/cubejs-docker/CHANGELOG.md
index 85900a7002..01dfdc90ee 100644
--- a/packages/cubejs-docker/CHANGELOG.md
+++ b/packages/cubejs-docker/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
+## [1.2.4](/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
 ## [1.1.18](https://github.com/cube-js/cube/compare/v1.1.17...v1.1.18) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/docker
diff --git a/packages/cubejs-docker/package.json b/packages/cubejs-docker/package.json
index 82ef5b60a6..0b358ca52c 100644
--- a/packages/cubejs-docker/package.json
+++ b/packages/cubejs-docker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-backend/docker",
-  "version": "1.1.18",
+  "version": "1.2.14",
   "description": "Cube.js In Docker (virtual package)",
   "author": "Cube Dev, Inc.",
   "license": "Apache-2.0",
@@ -9,36 +9,36 @@
     "node": "^14.0.0 || ^16.0.0 || >=17.0.0"
   },
   "dependencies": {
-    "@cubejs-backend/athena-driver": "1.1.17",
-    "@cubejs-backend/bigquery-driver": "1.1.17",
-    "@cubejs-backend/clickhouse-driver": "1.1.17",
-    "@cubejs-backend/crate-driver": "1.1.17",
-    "@cubejs-backend/databricks-jdbc-driver": "1.1.17",
-    "@cubejs-backend/dbt-schema-extension": "1.1.17",
-    "@cubejs-backend/dremio-driver": "1.1.17",
-    "@cubejs-backend/druid-driver": "1.1.17",
-    "@cubejs-backend/duckdb-driver": "1.1.17",
-    "@cubejs-backend/duckdb-server-driver": "1.1.17",
-    "@cubejs-backend/elasticsearch-driver": "1.1.17",
-    "@cubejs-backend/firebolt-driver": "1.1.17",
-    "@cubejs-backend/hive-driver": "1.1.17",
-    "@cubejs-backend/ksql-driver": "1.1.17",
-    "@cubejs-backend/materialize-driver": "1.1.17",
-    "@cubejs-backend/mongobi-driver": "1.1.17",
-    "@cubejs-backend/mssql-driver": "1.1.17",
-    "@cubejs-backend/mysql-driver": "1.1.17",
-    "@cubejs-backend/oracle-driver": "1.1.17",
-    "@cubejs-backend/pinot-driver": "1.1.17",
-    "@cubejs-backend/postgres-driver": "1.1.17",
-    "@cubejs-backend/prestodb-driver": "1.1.17",
-    "@cubejs-backend/questdb-driver": "1.1.17",
-    "@cubejs-backend/redshift-driver": "1.1.17",
-    "@cubejs-backend/server": "1.1.18",
-    "@cubejs-backend/snowflake-driver": "1.1.17",
-    "@cubejs-backend/sqlite-driver": "1.1.17",
-    "@cubejs-backend/trino-driver": "1.1.17",
-    "@cubejs-backend/vertica-driver": "1.1.17",
-    "cubejs-cli": "1.1.18",
+    "@cubejs-backend/athena-driver": "1.2.14",
+    "@cubejs-backend/bigquery-driver": "1.2.14",
+    "@cubejs-backend/clickhouse-driver": "1.2.14",
+    "@cubejs-backend/crate-driver": "1.2.14",
+    "@cubejs-backend/databricks-jdbc-driver": "1.2.14",
+    "@cubejs-backend/dbt-schema-extension": "1.2.14",
+    "@cubejs-backend/dremio-driver": "1.2.14",
+    "@cubejs-backend/druid-driver": "1.2.14",
+    "@cubejs-backend/duckdb-driver": "1.2.14",
+    "@cubejs-backend/duckdb-server-driver": "1.2.14",
+    "@cubejs-backend/elasticsearch-driver": "1.2.14",
+    "@cubejs-backend/firebolt-driver": "1.2.14",
+    "@cubejs-backend/hive-driver": "1.2.14",
+    "@cubejs-backend/ksql-driver": "1.2.14",
+    "@cubejs-backend/materialize-driver": "1.2.14",
+    "@cubejs-backend/mongobi-driver": "1.2.14",
+    "@cubejs-backend/mssql-driver": "1.2.14",
+    "@cubejs-backend/mysql-driver": "1.2.14",
+    "@cubejs-backend/oracle-driver": "1.2.14",
+    "@cubejs-backend/pinot-driver": "1.2.14",
+    "@cubejs-backend/postgres-driver": "1.2.14",
+    "@cubejs-backend/prestodb-driver": "1.2.14",
+    "@cubejs-backend/questdb-driver": "1.2.14",
+    "@cubejs-backend/redshift-driver": "1.2.14",
+    "@cubejs-backend/server": "1.2.14",
+    "@cubejs-backend/snowflake-driver": "1.2.14",
+    "@cubejs-backend/sqlite-driver": "1.2.14",
+    "@cubejs-backend/trino-driver": "1.2.14",
+    "@cubejs-backend/vertica-driver": "1.2.14",
+    "cubejs-cli": "1.2.14",
     "typescript": "~5.2.2"
   },
   "resolutions": {
diff --git a/packages/cubejs-docker/testing-drivers.Dockerfile b/packages/cubejs-docker/testing-drivers.Dockerfile
index 4ef851146a..b3d7648f16 100644
--- a/packages/cubejs-docker/testing-drivers.Dockerfile
+++ b/packages/cubejs-docker/testing-drivers.Dockerfile
@@ -27,6 +27,8 @@ COPY yarn.lock .
 COPY tsconfig.base.json .
 COPY rollup.config.js .
 COPY packages/cubejs-linter packages/cubejs-linter
+
+# Backend
 COPY rust/cubesql/package.json rust/cubesql/package.json
 COPY rust/cubestore/package.json rust/cubestore/package.json
 COPY rust/cubestore/bin rust/cubestore/bin
@@ -43,6 +45,7 @@ COPY packages/cubejs-clickhouse-driver/package.json packages/cubejs-clickhouse-d
 COPY packages/cubejs-crate-driver/package.json packages/cubejs-crate-driver/package.json
 COPY packages/cubejs-dremio-driver/package.json packages/cubejs-dremio-driver/package.json
 COPY packages/cubejs-druid-driver/package.json packages/cubejs-druid-driver/package.json
+COPY packages/cubejs-duckdb-driver/package.json packages/cubejs-duckdb-driver/package.json
 COPY packages/cubejs-elasticsearch-driver/package.json packages/cubejs-elasticsearch-driver/package.json
 COPY packages/cubejs-firebolt-driver/package.json packages/cubejs-firebolt-driver/package.json
 COPY packages/cubejs-hive-driver/package.json packages/cubejs-hive-driver/package.json
@@ -67,6 +70,7 @@ COPY packages/cubejs-sqlite-driver/package.json packages/cubejs-sqlite-driver/pa
 COPY packages/cubejs-ksql-driver/package.json packages/cubejs-ksql-driver/package.json
 COPY packages/cubejs-dbt-schema-extension/package.json packages/cubejs-dbt-schema-extension/package.json
 COPY packages/cubejs-jdbc-driver/package.json packages/cubejs-jdbc-driver/package.json
+COPY packages/cubejs-vertica-driver/package.json packages/cubejs-vertica-driver/package.json
 
 # We dont need client libraries
 #COPY packages/cubejs-templates/package.json packages/cubejs-templates/package.json
@@ -84,28 +88,24 @@ RUN yarn config set network-timeout 120000 -g
 ######################################################################
 # Databricks driver dependencies                                     #
 ######################################################################
-FROM base AS prod_base_dependencies
+FROM base as prod_base_dependencies
 COPY packages/cubejs-databricks-jdbc-driver/package.json packages/cubejs-databricks-jdbc-driver/package.json
 RUN mkdir packages/cubejs-databricks-jdbc-driver/bin
 RUN echo '#!/usr/bin/env node' > packages/cubejs-databricks-jdbc-driver/bin/post-install
 RUN yarn install --prod
 
-FROM prod_base_dependencies AS prod_dependencies
+FROM prod_base_dependencies as prod_dependencies
 COPY packages/cubejs-databricks-jdbc-driver/bin packages/cubejs-databricks-jdbc-driver/bin
 RUN yarn install --prod --ignore-scripts
 
 ######################################################################
 # Build dependencies                                                 #
 ######################################################################
-FROM base AS build_dependencies
+FROM base AS build
 
 RUN yarn install
 
-######################################################################
-# Build layer                                                        #
-######################################################################
-FROM build_dependencies AS build
-
+# Backend
 COPY rust/cubestore/ rust/cubestore/
 COPY rust/cubesql/ rust/cubesql/
 COPY packages/cubejs-backend-shared/ packages/cubejs-backend-shared/
@@ -121,6 +121,7 @@ COPY packages/cubejs-clickhouse-driver/ packages/cubejs-clickhouse-driver/
 COPY packages/cubejs-crate-driver/ packages/cubejs-crate-driver/
 COPY packages/cubejs-dremio-driver/ packages/cubejs-dremio-driver/
 COPY packages/cubejs-druid-driver/ packages/cubejs-druid-driver/
+COPY packages/cubejs-duckdb-driver/ packages/cubejs-duckdb-driver/
 COPY packages/cubejs-elasticsearch-driver/ packages/cubejs-elasticsearch-driver/
 COPY packages/cubejs-firebolt-driver/ packages/cubejs-firebolt-driver/
 COPY packages/cubejs-hive-driver/ packages/cubejs-hive-driver/
@@ -146,6 +147,7 @@ COPY packages/cubejs-ksql-driver/ packages/cubejs-ksql-driver/
 COPY packages/cubejs-dbt-schema-extension/ packages/cubejs-dbt-schema-extension/
 COPY packages/cubejs-jdbc-driver/ packages/cubejs-jdbc-driver/
 COPY packages/cubejs-databricks-jdbc-driver/ packages/cubejs-databricks-jdbc-driver/
+COPY packages/cubejs-vertica-driver/ packages/cubejs-vertica-driver/
 
 # We dont need client libraries
 #COPY packages/cubejs-templates/ packages/cubejs-templates/
@@ -158,7 +160,8 @@ COPY packages/cubejs-databricks-jdbc-driver/ packages/cubejs-databricks-jdbc-dri
 #COPY packages/cubejs-playground/ packages/cubejs-playground/
 
 # As we don't need any UI to test drivers, it's enough to transpile ts only.
-RUN yarn lerna run tsc
+RUN yarn lerna run build
+
 RUN find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +
 
 ######################################################################
@@ -177,7 +180,7 @@ COPY --from=prod_dependencies /cubejs .
 COPY packages/cubejs-docker/bin/cubejs-dev /usr/local/bin/cubejs
 
 # By default Node dont search in parent directory from /cube/conf, @todo Reaserch a little bit more
-ENV NODE_PATH=/cube/conf/node_modules:/cube/node_modules
+ENV NODE_PATH /cube/conf/node_modules:/cube/node_modules
 RUN ln -s  /cubejs/packages/cubejs-docker /cube
 RUN ln -s  /cubejs/rust/cubestore/bin/cubestore-dev /usr/local/bin/cubestore-dev
 
diff --git a/packages/cubejs-dremio-driver/CHANGELOG.md b/packages/cubejs-dremio-driver/CHANGELOG.md
index 594e4cd317..3515627fff 100644
--- a/packages/cubejs-dremio-driver/CHANGELOG.md
+++ b/packages/cubejs-dremio-driver/CHANGELOG.md
@@ -3,6 +3,68 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+### Bug Fixes
+
+- **dremio-driver:** Correct dremio date interval functions ([#9193](https://github.com/cube-js/cube/issues/9193)) ([7cf2287](https://github.com/cube-js/cube/commit/7cf2287e165beff948ddd88eb47bd0048812aa9b))
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Features
diff --git a/packages/cubejs-dremio-driver/driver/DremioQuery.js b/packages/cubejs-dremio-driver/driver/DremioQuery.js
index c46ade9c51..8e231f3d25 100644
--- a/packages/cubejs-dremio-driver/driver/DremioQuery.js
+++ b/packages/cubejs-dremio-driver/driver/DremioQuery.js
@@ -1,4 +1,5 @@
 const { BaseFilter, BaseQuery } = require('@cubejs-backend/schema-compiler');
+const { parseSqlInterval } = require('@cubejs-backend/shared');
 
 const GRANULARITY_TO_INTERVAL = {
   week: (date) => `DATE_TRUNC('week', ${date})`,
@@ -55,15 +56,39 @@ class DremioQuery extends BaseQuery {
   }
 
   dateTimeCast(value) {
-    return `TO_TIMESTAMP(${value})`;
+    return `TO_TIMESTAMP(${value}, 'YYYY-MM-DD"T"HH24:MI:SS.FFF')`;
   }
 
   subtractInterval(date, interval) {
-    return `DATE_SUB(${date}, INTERVAL ${interval})`;
+    const formattedTimeIntervals = this.formatInterval(interval);
+    const intervalFormatted = formattedTimeIntervals[0];
+    const timeUnit = formattedTimeIntervals[1];
+    return `DATE_SUB(${date}, CAST(${intervalFormatted} as INTERVAL ${timeUnit}))`;
   }
 
   addInterval(date, interval) {
-    return `DATE_ADD(${date}, INTERVAL ${interval})`;
+    const formattedTimeIntervals = this.formatInterval(interval);
+    const intervalFormatted = formattedTimeIntervals[0];
+    const timeUnit = formattedTimeIntervals[1];
+    return `DATE_ADD(${date}, CAST(${intervalFormatted} as INTERVAL ${timeUnit}))`;
+  }
+
+  /**
+   * @param {string} timestamp
+   * @param {string} interval
+   * @returns {string}
+   */
+  addTimestampInterval(timestamp, interval) {
+    return this.addInterval(timestamp, interval);
+  }
+
+  /**
+   * @param {string} timestamp
+   * @param {string} interval
+   * @returns {string}
+   */
+  subtractTimestampInterval(timestamp, interval) {
+    return this.subtractInterval(timestamp, interval);
   }
 
   timeGroupedColumn(granularity, dimension) {
@@ -78,7 +103,8 @@ class DremioQuery extends BaseQuery {
     const values = timeDimension.timeSeries().map(
       ([from, to]) => `select '${from}' f, '${to}' t`
     ).join(' UNION ALL ');
-    return `SELECT TO_TIMESTAMP(dates.f, 'YYYY-MM-DDTHH:MI:SS.FFF') date_from, TO_TIMESTAMP(dates.t, 'YYYY-MM-DDTHH:MI:SS.FFF') date_to FROM (${values}) AS dates`;
+
+    return `SELECT TO_TIMESTAMP(dates.f, 'YYYY-MM-DD"T"HH24:MI:SS.FFF') date_from, TO_TIMESTAMP(dates.t, 'YYYY-MM-DD"T"HH24:MI:SS.FFF') date_to FROM (${values}) AS dates`;
   }
 
   concatStringsSql(strings) {
@@ -92,6 +118,55 @@ class DremioQuery extends BaseQuery {
   wrapSegmentForDimensionSelect(sql) {
     return `IF(${sql}, 1, 0)`;
   }
+
+  /**
+   * The input interval with (possible) plural units, like "1 hour 2 minutes", "2 year", "3 months", "4 weeks", "5 days", "3 months 24 days 15 minutes", ...
+   * will be converted to Dremio dialect.
+   * @see https://docs.dremio.com/24.3.x/reference/sql/sql-functions/functions/DATE_ADD/
+   * @see https://docs.dremio.com/24.3.x/reference/sql/sql-functions/functions/DATE_SUB/
+   * It returns a tuple of (formatted interval, timeUnit to use in date functions)
+   * This function only supports the following scenarios for now:
+   *   ie. n year[s] or n quarter[s] or n month[s] or n week[s] or n day[s]
+   */
+  formatInterval(interval) {
+    const intervalParsed = parseSqlInterval(interval);
+    const intKeys = Object.keys(intervalParsed).length;
+
+    if (intervalParsed.year && intKeys === 1) {
+      return [`${intervalParsed.year}`, 'YEAR'];
+    } else if (intervalParsed.quarter && intKeys === 1) {
+      // dremio interval does not support quarter. Convert to month
+      return [`${intervalParsed.quarter * 3}`, 'MONTH'];
+    } else if (intervalParsed.week && intKeys === 1) {
+      // dremio interval does not support week. Convert to days
+      return [`${intervalParsed.week * 7}`, 'DAY'];
+    } else if (intervalParsed.month && intKeys === 1) {
+      return [`${intervalParsed.month}`, 'MONTH'];
+    } else if (intervalParsed.month && intKeys === 1) {
+      return [`${intervalParsed.day}`, 'DAY'];
+    } else if (intervalParsed.hour && intKeys === 1) {
+      return [`${intervalParsed.hour}`, 'HOUR'];
+    } else if (intervalParsed.minute && intKeys === 1) {
+      return [`${intervalParsed.minute}`, 'MINUTE'];
+    } else if (intervalParsed.second && intKeys === 1) {
+      return [`${intervalParsed.second}`, 'SECOND'];
+    }
+
+    throw new Error(`Cannot transform interval expression "${interval}" to Dremio dialect`);
+  }
+
+  sqlTemplates() {
+    const templates = super.sqlTemplates();
+    templates.functions.CURRENTDATE = 'CURRENT_DATE';
+    templates.functions.DATETRUNC = 'DATE_TRUNC(\'{{ date_part }}\', {{ args_concat }})';
+    templates.functions.DATEPART = 'DATE_PART(\'{{ date_part }}\', {{ args_concat }})';
+    // really need the date locale formatting here...
+    templates.functions.DATE = 'TO_DATE({{ args_concat }},\'YYYY-MM-DD\', 1)';
+    templates.functions.DATEDIFF = 'DATE_DIFF(DATE, DATE_TRUNC(\'{{ date_part }}\', {{ args[1] }}), DATE_TRUNC(\'{{ date_part }}\', {{ args[2] }}))';
+    templates.expressions.interval_single_date_part = 'CAST({{ num }} as INTERVAL {{ date_part }})';
+    templates.quotes.identifiers = '"';
+    return templates;
+  }
 }
 
 module.exports = DremioQuery;
diff --git a/packages/cubejs-dremio-driver/package.json b/packages/cubejs-dremio-driver/package.json
index fb89b50e17..e1d5f05091 100644
--- a/packages/cubejs-dremio-driver/package.json
+++ b/packages/cubejs-dremio-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/dremio-driver",
   "description": "Cube.js Dremio driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -22,15 +22,15 @@
     "lint:fix": "eslint driver/*.js"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/schema-compiler": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
-    "axios": "^0.21.1",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/schema-compiler": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
+    "axios": "^0.28.0",
     "sqlstring": "^2.3.1"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/testing-shared": "1.1.17",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/testing-shared": "1.2.14",
     "jest": "^27"
   },
   "license": "Apache-2.0",
diff --git a/packages/cubejs-druid-driver/CHANGELOG.md b/packages/cubejs-druid-driver/CHANGELOG.md
index 34fd036484..9ad7d665db 100644
--- a/packages/cubejs-druid-driver/CHANGELOG.md
+++ b/packages/cubejs-druid-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Features
diff --git a/packages/cubejs-druid-driver/package.json b/packages/cubejs-druid-driver/package.json
index 18e179ec50..9b55867256 100644
--- a/packages/cubejs-druid-driver/package.json
+++ b/packages/cubejs-druid-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/druid-driver",
   "description": "Cube.js Druid database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -28,13 +28,13 @@
     "dist/src/*"
   ],
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/schema-compiler": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
-    "axios": "^0.21.1"
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/schema-compiler": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
+    "axios": "^0.28.0"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/generic-pool": "^3.1.9",
     "@types/jest": "^27",
     "@types/node": "^18",
diff --git a/packages/cubejs-druid-driver/src/DruidClient.ts b/packages/cubejs-druid-driver/src/DruidClient.ts
index fa07f0c43f..46bfcdc711 100644
--- a/packages/cubejs-druid-driver/src/DruidClient.ts
+++ b/packages/cubejs-druid-driver/src/DruidClient.ts
@@ -63,7 +63,7 @@ export class DruidClient {
           },
         });
 
-        if (cancelled) {
+        if (cancelled && response.headers['x-druid-sql-query-id']) {
           await this.cancel(response.headers['x-druid-sql-query-id']);
 
           throw new Error('Query cancelled');
diff --git a/packages/cubejs-duckdb-driver/CHANGELOG.md b/packages/cubejs-duckdb-driver/CHANGELOG.md
index 356e1574a0..87ffc96727 100644
--- a/packages/cubejs-duckdb-driver/CHANGELOG.md
+++ b/packages/cubejs-duckdb-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/duckdb-driver
diff --git a/packages/cubejs-duckdb-driver/package.json b/packages/cubejs-duckdb-driver/package.json
index a8d8b745b6..76ae30a693 100644
--- a/packages/cubejs-duckdb-driver/package.json
+++ b/packages/cubejs-duckdb-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/duckdb-driver",
   "description": "Cube DuckDB database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -27,15 +27,15 @@
     "lint:fix": "eslint --fix src/* --ext .ts"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/schema-compiler": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/schema-compiler": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "duckdb": "^1.1.3"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/testing-shared": "1.1.17",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/testing-shared": "1.2.14",
     "@types/jest": "^27",
     "@types/node": "^18",
     "jest": "^27",
diff --git a/packages/cubejs-duckdb-server-driver/package.json b/packages/cubejs-duckdb-server-driver/package.json
index 1a9e54af67..4bb3e07f8f 100644
--- a/packages/cubejs-duckdb-server-driver/package.json
+++ b/packages/cubejs-duckdb-server-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/duckdb-server-driver",
   "description": "Cube DuckDB Server driver",
   "author": "Alexander Kolov",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/luabase/cube.git",
diff --git a/packages/cubejs-elasticsearch-driver/CHANGELOG.md b/packages/cubejs-elasticsearch-driver/CHANGELOG.md
index 5eb2baabd7..e43ad705af 100644
--- a/packages/cubejs-elasticsearch-driver/CHANGELOG.md
+++ b/packages/cubejs-elasticsearch-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
diff --git a/packages/cubejs-elasticsearch-driver/package.json b/packages/cubejs-elasticsearch-driver/package.json
index ff9a0eab6e..5e0eb99547 100644
--- a/packages/cubejs-elasticsearch-driver/package.json
+++ b/packages/cubejs-elasticsearch-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/elasticsearch-driver",
   "description": "Cube.js elasticsearch database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -23,14 +23,14 @@
     "driver"
   ],
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "@elastic/elasticsearch": "7.12.0",
     "sqlstring": "^2.3.1"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/jest": "^27",
     "jest": "^27",
     "testcontainers": "^10.10.4"
diff --git a/packages/cubejs-firebolt-driver/CHANGELOG.md b/packages/cubejs-firebolt-driver/CHANGELOG.md
index 7bbe924de5..207a1bc45e 100644
--- a/packages/cubejs-firebolt-driver/CHANGELOG.md
+++ b/packages/cubejs-firebolt-driver/CHANGELOG.md
@@ -3,6 +3,68 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+### Features
+
+- **server-core:** Introduce CUBEJS_REFRESH_WORKER_CONCURRENCY env and update default concurrency settings for drivers ([#9168](https://github.com/cube-js/cube/issues/9168)) ([7ef6282](https://github.com/cube-js/cube/commit/7ef628273905d47996b108862a52dde89b9525e3))
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/firebolt-driver
diff --git a/packages/cubejs-firebolt-driver/package.json b/packages/cubejs-firebolt-driver/package.json
index 10f3e95ff6..6d6a164372 100644
--- a/packages/cubejs-firebolt-driver/package.json
+++ b/packages/cubejs-firebolt-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/firebolt-driver",
   "description": "Cube.js Firebolt database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -28,15 +28,15 @@
     "lint:fix": "eslint --fix src/* --ext .ts"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/schema-compiler": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/schema-compiler": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "firebolt-sdk": "1.10.0"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/testing-shared": "1.1.17",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/testing-shared": "1.2.14",
     "typescript": "~5.2.2"
   },
   "publishConfig": {
diff --git a/packages/cubejs-firebolt-driver/src/FireboltDriver.ts b/packages/cubejs-firebolt-driver/src/FireboltDriver.ts
index 10ce708a2d..a9ccc9e416 100644
--- a/packages/cubejs-firebolt-driver/src/FireboltDriver.ts
+++ b/packages/cubejs-firebolt-driver/src/FireboltDriver.ts
@@ -46,7 +46,7 @@ export class FireboltDriver extends BaseDriver implements DriverInterface {
    * Returns default concurrency value.
    */
   public static getDefaultConcurrency(): number {
-    return 5;
+    return 10;
   }
 
   private config: FireboltDriverConfiguration;
diff --git a/packages/cubejs-hive-driver/CHANGELOG.md b/packages/cubejs-hive-driver/CHANGELOG.md
index c4a6d861c2..f667e8d259 100644
--- a/packages/cubejs-hive-driver/CHANGELOG.md
+++ b/packages/cubejs-hive-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/hive-driver
diff --git a/packages/cubejs-hive-driver/package.json b/packages/cubejs-hive-driver/package.json
index 810006480e..8d0bff06c7 100644
--- a/packages/cubejs-hive-driver/package.json
+++ b/packages/cubejs-hive-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/hive-driver",
   "description": "Cube.js Hive database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -17,8 +17,8 @@
     "lint:fix": "eslint --fix src/* --ext .ts"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "generic-pool": "^3.6.0",
     "jshs2": "^0.4.4",
     "sasl-plain": "^0.1.0",
@@ -28,7 +28,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0"
+    "@cubejs-backend/linter": "1.2.14"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/cubejs-jdbc-driver/CHANGELOG.md b/packages/cubejs-jdbc-driver/CHANGELOG.md
index 7fbd177a60..8e3e6ce2b9 100644
--- a/packages/cubejs-jdbc-driver/CHANGELOG.md
+++ b/packages/cubejs-jdbc-driver/CHANGELOG.md
@@ -3,6 +3,68 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+### Features
+
+- **schema-compiler:** Boost models transpilation 10-13x times (using SWC instead of Babel) ([#9225](https://github.com/cube-js/cube/issues/9225)) ([2dd9a4a](https://github.com/cube-js/cube/commit/2dd9a4a5ba0f178e304befc476609fc30ada8975))
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/jdbc-driver
diff --git a/packages/cubejs-jdbc-driver/package.json b/packages/cubejs-jdbc-driver/package.json
index 481e639c7c..59dfb2782e 100644
--- a/packages/cubejs-jdbc-driver/package.json
+++ b/packages/cubejs-jdbc-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/jdbc-driver",
   "description": "Cube.js JDBC database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -25,8 +25,8 @@
     "index.js"
   ],
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "generic-pool": "^3.1.7",
     "node-java-maven": "^0.1.2",
     "sqlstring": "^2.3.0"
@@ -43,8 +43,7 @@
     "testEnvironment": "node"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/shared": "^0.35.67",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/generic-pool": "^3.1.9",
     "@types/node": "^18",
     "@types/sqlstring": "^2.3.0",
diff --git a/packages/cubejs-ksql-driver/CHANGELOG.md b/packages/cubejs-ksql-driver/CHANGELOG.md
index dee1cbe29f..b322a25988 100644
--- a/packages/cubejs-ksql-driver/CHANGELOG.md
+++ b/packages/cubejs-ksql-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/ksql-driver
diff --git a/packages/cubejs-ksql-driver/package.json b/packages/cubejs-ksql-driver/package.json
index 975e70f900..9993d7f86e 100644
--- a/packages/cubejs-ksql-driver/package.json
+++ b/packages/cubejs-ksql-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/ksql-driver",
   "description": "Cube.js ksql database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -25,11 +25,11 @@
     "lint:fix": "eslint --fix src/* --ext .ts"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/schema-compiler": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/schema-compiler": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "async-mutex": "0.3.2",
-    "axios": "^0.21.1",
+    "axios": "^0.28.0",
     "kafkajs": "^2.2.3",
     "sqlstring": "^2.3.1"
   },
@@ -44,7 +44,7 @@
     "testEnvironment": "node"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "typescript": "~5.2.2"
   }
 }
diff --git a/packages/cubejs-linter/CHANGELOG.md b/packages/cubejs-linter/CHANGELOG.md
index 956434528f..34f85398a9 100644
--- a/packages/cubejs-linter/CHANGELOG.md
+++ b/packages/cubejs-linter/CHANGELOG.md
@@ -3,320 +3,230 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [1.0.0](https://github.com/cube-js/cube/compare/v0.36.11...v1.0.0) (2024-10-15)
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
-# [0.36.0](https://github.com/cube-js/cube/compare/v0.35.81...v0.36.0) (2024-09-13)
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
-# [0.35.0](https://github.com/cube-js/cube/compare/v0.34.62...v0.35.0) (2024-03-14)
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-## [0.34.25](https://github.com/cube-js/cube/compare/v0.34.24...v0.34.25) (2023-11-24)
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
-# [0.34.0](https://github.com/cube-js/cube/compare/v0.33.65...v0.34.0) (2023-10-03)
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
-# [0.33.0](https://github.com/cube-js/cube/compare/v0.32.31...v0.33.0) (2023-05-02)
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
+# [1.0.0](https://github.com/cube-js/cube/compare/v0.36.11...v1.0.0) (2024-10-15)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
+# [0.36.0](https://github.com/cube-js/cube/compare/v0.35.81...v0.36.0) (2024-09-13)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
-## [0.32.28](https://github.com/cube-js/cube/compare/v0.32.27...v0.32.28) (2023-04-19)
+# [0.35.0](https://github.com/cube-js/cube/compare/v0.34.62...v0.35.0) (2024-03-14)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
+## [0.34.25](https://github.com/cube-js/cube/compare/v0.34.24...v0.34.25) (2023-11-24)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
+# [0.34.0](https://github.com/cube-js/cube/compare/v0.33.65...v0.34.0) (2023-10-03)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
-## [0.32.12](https://github.com/cube-js/cube/compare/v0.32.11...v0.32.12) (2023-03-22)
+# [0.33.0](https://github.com/cube-js/cube/compare/v0.32.31...v0.33.0) (2023-05-02)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
+## [0.32.28](https://github.com/cube-js/cube/compare/v0.32.27...v0.32.28) (2023-04-19)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
+## [0.32.12](https://github.com/cube-js/cube/compare/v0.32.11...v0.32.12) (2023-03-22)
 
+**Note:** Version bump only for package @cubejs-backend/linter
 
 # [0.32.0](https://github.com/cube-js/cube.js/compare/v0.31.69...v0.32.0) (2023-03-02)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 # [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 # [0.30.0](https://github.com/cube-js/cube.js/compare/v0.29.57...v0.30.0) (2022-05-11)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 ## [0.29.23](https://github.com/cube-js/cube.js/compare/v0.29.22...v0.29.23) (2022-01-26)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 ## [0.29.21](https://github.com/cube-js/cube.js/compare/v0.29.20...v0.29.21) (2022-01-17)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 # [0.29.0](https://github.com/cube-js/cube.js/compare/v0.28.67...v0.29.0) (2021-12-14)
 
-
 ### Reverts
 
-* Revert "BREAKING CHANGE: 0.29 (#3809)" (#3811) ([db005ed](https://github.com/cube-js/cube.js/commit/db005edc04d48e8251250ab9d0e19f496cf3b52b)), closes [#3809](https://github.com/cube-js/cube.js/issues/3809) [#3811](https://github.com/cube-js/cube.js/issues/3811)
-
-
-* BREAKING CHANGE: 0.29 (#3809) ([6f1418b](https://github.com/cube-js/cube.js/commit/6f1418b9963774844f341682e594601a56bb0084)), closes [#3809](https://github.com/cube-js/cube.js/issues/3809)
+- Revert "BREAKING CHANGE: 0.29 (#3809)" (#3811) ([db005ed](https://github.com/cube-js/cube.js/commit/db005edc04d48e8251250ab9d0e19f496cf3b52b)), closes [#3809](https://github.com/cube-js/cube.js/issues/3809) [#3811](https://github.com/cube-js/cube.js/issues/3811)
 
+- BREAKING CHANGE: 0.29 (#3809) ([6f1418b](https://github.com/cube-js/cube.js/commit/6f1418b9963774844f341682e594601a56bb0084)), closes [#3809](https://github.com/cube-js/cube.js/issues/3809)
 
 ### BREAKING CHANGES
 
-* Drop support for Node.js 10 (12.x is a minimal version)
-* Upgrade Node.js to 14 for Docker images
-* Drop support for Node.js 15
-
-
-
-
+- Drop support for Node.js 10 (12.x is a minimal version)
+- Upgrade Node.js to 14 for Docker images
+- Drop support for Node.js 15
 
 ## [0.28.22](https://github.com/cube-js/cube.js/compare/v0.28.21...v0.28.22) (2021-08-17)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 ## [0.28.17](https://github.com/cube-js/cube.js/compare/v0.28.16...v0.28.17) (2021-08-11)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 ## [0.28.6](https://github.com/cube-js/cube.js/compare/v0.28.5...v0.28.6) (2021-07-22)
 
-
 ### Features
 
-* **@cubejs-client/ngx:** async CubejsClient initialization ([#2876](https://github.com/cube-js/cube.js/issues/2876)) ([bba3a01](https://github.com/cube-js/cube.js/commit/bba3a01d2a072093509633f2d26e8df9677f940c))
-
-
-
-
+- **@cubejs-client/ngx:** async CubejsClient initialization ([#2876](https://github.com/cube-js/cube.js/issues/2876)) ([bba3a01](https://github.com/cube-js/cube.js/commit/bba3a01d2a072093509633f2d26e8df9677f940c))
 
 # [0.28.0](https://github.com/cube-js/cube.js/compare/v0.27.53...v0.28.0) (2021-07-17)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 # [0.27.0](https://github.com/cube-js/cube.js/compare/v0.26.104...v0.27.0) (2021-04-26)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 ## [0.26.74](https://github.com/cube-js/cube.js/compare/v0.26.73...v0.26.74) (2021-04-01)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 ## [0.26.54](https://github.com/cube-js/cube.js/compare/v0.26.53...v0.26.54) (2021-03-12)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 ## [0.26.13](https://github.com/cube-js/cube.js/compare/v0.26.12...v0.26.13) (2021-02-12)
 
-
 ### Features
 
-* type detection - check overflows for int/bigint ([393948a](https://github.com/cube-js/cube.js/commit/393948ae5fabf1c4b46ce4ea2b2dc22e8f012ee1))
-
-
-
-
+- type detection - check overflows for int/bigint ([393948a](https://github.com/cube-js/cube.js/commit/393948ae5fabf1c4b46ce4ea2b2dc22e8f012ee1))
 
 ## [0.26.11](https://github.com/cube-js/cube.js/compare/v0.26.10...v0.26.11) (2021-02-10)
 
-
 ### Bug Fixes
 
-* CUBEJS_SCHEDULED_REFRESH_TIMER, fix [#1972](https://github.com/cube-js/cube.js/issues/1972) ([#1975](https://github.com/cube-js/cube.js/issues/1975)) ([dac7e52](https://github.com/cube-js/cube.js/commit/dac7e52ee0d3a118c9d69c9d030e58a3c048cca1))
-
-
-
-
+- CUBEJS_SCHEDULED_REFRESH_TIMER, fix [#1972](https://github.com/cube-js/cube.js/issues/1972) ([#1975](https://github.com/cube-js/cube.js/issues/1975)) ([dac7e52](https://github.com/cube-js/cube.js/commit/dac7e52ee0d3a118c9d69c9d030e58a3c048cca1))
 
 # [0.26.0](https://github.com/cube-js/cube.js/compare/v0.25.33...v0.26.0) (2021-02-01)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 # [0.25.0](https://github.com/cube-js/cube.js/compare/v0.24.15...v0.25.0) (2020-12-21)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 ## [0.24.5](https://github.com/cube-js/cube.js/compare/v0.24.4...v0.24.5) (2020-12-09)
 
-
 ### Features
 
-* **cubejs-cli:** improve DX for docker ([#1457](https://github.com/cube-js/cube.js/issues/1457)) ([72ad782](https://github.com/cube-js/cube.js/commit/72ad782090c52e677b9e51e43818f1dca40db791))
-
-
-
-
+- **cubejs-cli:** improve DX for docker ([#1457](https://github.com/cube-js/cube.js/issues/1457)) ([72ad782](https://github.com/cube-js/cube.js/commit/72ad782090c52e677b9e51e43818f1dca40db791))
 
 ## [0.24.4](https://github.com/cube-js/cube.js/compare/v0.24.3...v0.24.4) (2020-12-07)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 ## [0.24.3](https://github.com/cube-js/cube.js/compare/v0.24.2...v0.24.3) (2020-12-01)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 ## [0.24.2](https://github.com/cube-js/cube.js/compare/v0.24.1...v0.24.2) (2020-11-27)
 
-
 ### Features
 
-* **@cubejs-backend/query-orchestrator:** Initial move to TypeScript ([#1462](https://github.com/cube-js/cube.js/issues/1462)) ([101e8dc](https://github.com/cube-js/cube.js/commit/101e8dc90d4b1266c0327adb86cab3e3caa8d4d0))
-
-
-
-
+- **@cubejs-backend/query-orchestrator:** Initial move to TypeScript ([#1462](https://github.com/cube-js/cube.js/issues/1462)) ([101e8dc](https://github.com/cube-js/cube.js/commit/101e8dc90d4b1266c0327adb86cab3e3caa8d4d0))
 
 # [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 ## [0.23.7](https://github.com/cube-js/cube.js/compare/v0.23.6...v0.23.7) (2020-11-04)
 
-
 ### Features
 
-* **cubejs-cli:** Completely move CLI to TypeScript ([#1281](https://github.com/cube-js/cube.js/issues/1281)) ([dd5f3e2](https://github.com/cube-js/cube.js/commit/dd5f3e2948c82713354743af4a2727becac81388))
-
-
-
-
+- **cubejs-cli:** Completely move CLI to TypeScript ([#1281](https://github.com/cube-js/cube.js/issues/1281)) ([dd5f3e2](https://github.com/cube-js/cube.js/commit/dd5f3e2948c82713354743af4a2727becac81388))
 
 # [0.23.0](https://github.com/cube-js/cube.js/compare/v0.22.4...v0.23.0) (2020-10-28)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 # [0.22.0](https://github.com/cube-js/cube.js/compare/v0.21.2...v0.22.0) (2020-10-20)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 ## [0.21.1](https://github.com/cube-js/cube.js/compare/v0.21.0...v0.21.1) (2020-10-15)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 # [0.21.0](https://github.com/cube-js/cube.js/compare/v0.20.15...v0.21.0) (2020-10-09)
 
 **Note:** Version bump only for package @cubejs-backend/linter
 
-
-
-
-
 ## [0.20.11](https://github.com/cube-js/cube.js/compare/v0.20.10...v0.20.11) (2020-09-28)
 
-
 ### Features
 
-* Introduce Druid driver ([#1099](https://github.com/cube-js/cube.js/issues/1099)) ([2bfe20f](https://github.com/cube-js/cube.js/commit/2bfe20f))
+- Introduce Druid driver ([#1099](https://github.com/cube-js/cube.js/issues/1099)) ([2bfe20f](https://github.com/cube-js/cube.js/commit/2bfe20f))
diff --git a/packages/cubejs-linter/package.json b/packages/cubejs-linter/package.json
index 6ba2aff42e..6d16a2b07c 100644
--- a/packages/cubejs-linter/package.json
+++ b/packages/cubejs-linter/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/linter",
   "description": "Cube.js ESLint (virtual package) for linting code",
   "author": "Cube Dev, Inc.",
-  "version": "1.0.0",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -21,7 +21,7 @@
     "eslint": "^8.54.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-node": "^9.2.0"
+    "eslint-plugin-node": "^10.0.0"
   },
   "files": [
     "index.js"
diff --git a/packages/cubejs-materialize-driver/CHANGELOG.md b/packages/cubejs-materialize-driver/CHANGELOG.md
index d7a880280f..c4fdd0804f 100644
--- a/packages/cubejs-materialize-driver/CHANGELOG.md
+++ b/packages/cubejs-materialize-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/materialize-driver
diff --git a/packages/cubejs-materialize-driver/package.json b/packages/cubejs-materialize-driver/package.json
index 8ecd2c6d21..1dd2cb7a73 100644
--- a/packages/cubejs-materialize-driver/package.json
+++ b/packages/cubejs-materialize-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/materialize-driver",
   "description": "Cube.js Materialize database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -27,17 +27,17 @@
     "lint:fix": "eslint --fix src/* --ext .ts"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/postgres-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/postgres-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "@types/pg": "^8.6.0",
     "pg": "^8.6.0",
     "semver": "^7.6.3"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/testing": "1.1.17",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/testing": "1.2.14",
     "typescript": "~5.2.2"
   },
   "publishConfig": {
diff --git a/packages/cubejs-mongobi-driver/CHANGELOG.md b/packages/cubejs-mongobi-driver/CHANGELOG.md
index 04fd7b775e..8bdd668375 100644
--- a/packages/cubejs-mongobi-driver/CHANGELOG.md
+++ b/packages/cubejs-mongobi-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/mongobi-driver
diff --git a/packages/cubejs-mongobi-driver/package.json b/packages/cubejs-mongobi-driver/package.json
index 71d829c151..adc603f93d 100644
--- a/packages/cubejs-mongobi-driver/package.json
+++ b/packages/cubejs-mongobi-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/mongobi-driver",
   "description": "Cube.js MongoBI driver",
   "author": "krunalsabnis@gmail.com",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -27,8 +27,8 @@
     "integration:mongobi": "jest dist/test"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "@types/node": "^18",
     "generic-pool": "^3.8.2",
     "moment": "^2.29.1",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/generic-pool": "^3.1.9",
     "testcontainers": "^10.10.4",
     "typescript": "~5.2.2"
diff --git a/packages/cubejs-mssql-driver/CHANGELOG.md b/packages/cubejs-mssql-driver/CHANGELOG.md
index 8caeaae7b9..5b6707d1e7 100644
--- a/packages/cubejs-mssql-driver/CHANGELOG.md
+++ b/packages/cubejs-mssql-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Features
diff --git a/packages/cubejs-mssql-driver/package.json b/packages/cubejs-mssql-driver/package.json
index 86641b0dcc..d19f7fa800 100644
--- a/packages/cubejs-mssql-driver/package.json
+++ b/packages/cubejs-mssql-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/mssql-driver",
   "description": "Cube.js MS SQL database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -13,7 +13,7 @@
   },
   "main": "driver/MSSqlDriver.js",
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
     "mssql": "^10.0.2"
   },
   "devDependencies": {
diff --git a/packages/cubejs-mysql-aurora-serverless-driver/CHANGELOG.md b/packages/cubejs-mysql-aurora-serverless-driver/CHANGELOG.md
index 4f1dc20597..d8222317c2 100644
--- a/packages/cubejs-mysql-aurora-serverless-driver/CHANGELOG.md
+++ b/packages/cubejs-mysql-aurora-serverless-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
diff --git a/packages/cubejs-mysql-aurora-serverless-driver/package.json b/packages/cubejs-mysql-aurora-serverless-driver/package.json
index e9f07c1457..7bff960a2d 100644
--- a/packages/cubejs-mysql-aurora-serverless-driver/package.json
+++ b/packages/cubejs-mysql-aurora-serverless-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/mysql-aurora-serverless-driver",
   "description": "Cube.js Aurora Serverless Mysql database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -21,14 +21,14 @@
     "lint": "eslint driver/*.js test/*.js"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "@types/mysql": "^2.15.15",
     "aws-sdk": "^2.787.0",
     "data-api-client": "^1.1.0"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/data-api-client": "^1.2.1",
     "jest": "^27",
     "testcontainers": "^10.10.4"
diff --git a/packages/cubejs-mysql-driver/CHANGELOG.md b/packages/cubejs-mysql-driver/CHANGELOG.md
index 4e841c0b21..eecb3f486d 100644
--- a/packages/cubejs-mysql-driver/CHANGELOG.md
+++ b/packages/cubejs-mysql-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Bug Fixes
diff --git a/packages/cubejs-mysql-driver/package.json b/packages/cubejs-mysql-driver/package.json
index ffe1c08f13..3123a9bb09 100644
--- a/packages/cubejs-mysql-driver/package.json
+++ b/packages/cubejs-mysql-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/mysql-driver",
   "description": "Cube.js Mysql database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -27,15 +27,15 @@
     "lint:fix": "eslint --fix src/* test/* --ext .ts,.js"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "@types/mysql": "^2.15.21",
     "generic-pool": "^3.6.0",
     "mysql": "^2.18.1"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/testing-shared": "1.1.17",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/testing-shared": "1.2.14",
     "@types/generic-pool": "^3.1.9",
     "@types/jest": "^27",
     "jest": "^27",
diff --git a/packages/cubejs-oracle-driver/CHANGELOG.md b/packages/cubejs-oracle-driver/CHANGELOG.md
index e0097f91ad..14b0481fd5 100644
--- a/packages/cubejs-oracle-driver/CHANGELOG.md
+++ b/packages/cubejs-oracle-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Bug Fixes
diff --git a/packages/cubejs-oracle-driver/package.json b/packages/cubejs-oracle-driver/package.json
index e7a33d4398..e8ca14fdf1 100644
--- a/packages/cubejs-oracle-driver/package.json
+++ b/packages/cubejs-oracle-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/oracle-driver",
   "description": "Cube.js oracle database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -13,7 +13,7 @@
   },
   "main": "driver/OracleDriver.js",
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
     "ramda": "^0.27.0"
   },
   "optionalDependencies": {
diff --git a/packages/cubejs-pinot-driver/CHANGELOG.md b/packages/cubejs-pinot-driver/CHANGELOG.md
index a35ac59361..3aed9a80e8 100644
--- a/packages/cubejs-pinot-driver/CHANGELOG.md
+++ b/packages/cubejs-pinot-driver/CHANGELOG.md
@@ -3,6 +3,68 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+### Features
+
+- **server-core:** Introduce CUBEJS_REFRESH_WORKER_CONCURRENCY env and update default concurrency settings for drivers ([#9168](https://github.com/cube-js/cube/issues/9168)) ([7ef6282](https://github.com/cube-js/cube/commit/7ef628273905d47996b108862a52dde89b9525e3))
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/pinot-driver
diff --git a/packages/cubejs-pinot-driver/package.json b/packages/cubejs-pinot-driver/package.json
index 0147c3bd05..5d879cf5f6 100644
--- a/packages/cubejs-pinot-driver/package.json
+++ b/packages/cubejs-pinot-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/pinot-driver",
   "description": "Cube.js Pinot database driver",
   "author": "Julian Ronsse, InTheMemory, Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -27,9 +27,9 @@
     "lint:fix": "eslint --fix src/* --ext .ts"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/schema-compiler": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/schema-compiler": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "node-fetch": "^2.6.1",
     "ramda": "^0.27.2",
     "sqlstring": "^2.3.3"
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/jest": "^27",
     "jest": "^27",
     "should": "^13.2.3",
diff --git a/packages/cubejs-pinot-driver/src/PinotDriver.ts b/packages/cubejs-pinot-driver/src/PinotDriver.ts
index c9f96de3f0..be02426001 100644
--- a/packages/cubejs-pinot-driver/src/PinotDriver.ts
+++ b/packages/cubejs-pinot-driver/src/PinotDriver.ts
@@ -74,7 +74,7 @@ export class PinotDriver extends BaseDriver implements DriverInterface {
    * Returns default concurrency value.
    */
   public static getDefaultConcurrency() {
-    return 2;
+    return 10;
   }
 
   private config: PinotDriverConfiguration;
diff --git a/packages/cubejs-playground/CHANGELOG.md b/packages/cubejs-playground/CHANGELOG.md
index 1d9e5e0a70..c0e5fa49dc 100644
--- a/packages/cubejs-playground/CHANGELOG.md
+++ b/packages/cubejs-playground/CHANGELOG.md
@@ -3,6 +3,72 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-client/playground
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-client/playground
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-client/playground
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-client/playground
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-client/playground
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-client/playground
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-client/playground
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-client/playground
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-client/playground
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-client/playground
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+### Bug Fixes
+
+- **cubejs-playground:** update query builder ([#9201](https://github.com/cube-js/cube/issues/9201)) ([f8e523b](https://github.com/cube-js/cube/commit/f8e523bbf815b2fb3fb8eb036d04cc3bf4db206d))
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-client/playground
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-client/playground
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-client/playground
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+### Bug Fixes
+
+- **@cubejs-client/ngx:** Update APF configuration and build settings for Angular 12+ compatibility ([#9152](https://github.com/cube-js/cube/issues/9152)) Thanks to @HaidarZ! ([57bcbc4](https://github.com/cube-js/cube/commit/57bcbc482002aaa025ba5eab8960ecc5784faa55))
+- **cubejs-playground:** update query builder ([#9175](https://github.com/cube-js/cube/issues/9175)) ([4e9ed0e](https://github.com/cube-js/cube/commit/4e9ed0eae46c4abb1b84e6423bbc94ad93da37c3))
+- **cubejs-playground:** update query builder ([#9184](https://github.com/cube-js/cube/issues/9184)) ([247ac0c](https://github.com/cube-js/cube/commit/247ac0c4028aef5295e88cd501323b94c5a4eaab))
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-client/playground
diff --git a/packages/cubejs-playground/package.json b/packages/cubejs-playground/package.json
index 9667c0b4d2..52290d7c62 100644
--- a/packages/cubejs-playground/package.json
+++ b/packages/cubejs-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cubejs-client/playground",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "engines": {},
   "repository": {
     "type": "git",
@@ -68,8 +68,8 @@
     "@ant-design/compatible": "^1.0.1",
     "@ant-design/icons": "^5.3.5",
     "@cube-dev/ui-kit": "0.52.3",
-    "@cubejs-client/core": "1.1.12",
-    "@cubejs-client/react": "1.1.16",
+    "@cubejs-client/core": "1.2.14",
+    "@cubejs-client/react": "1.2.14",
     "@types/flexsearch": "^0.7.3",
     "@types/node": "^18",
     "@types/react": "^18.3.4",
diff --git a/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilder.tsx b/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilder.tsx
index 3eb3bfe0a7..65417c0397 100644
--- a/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilder.tsx
+++ b/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilder.tsx
@@ -1,6 +1,6 @@
 import { Alert, Block, Card, PrismCode, Title } from '@cube-dev/ui-kit';
 import cube, { Query } from '@cubejs-client/core';
-import { useEffect, useMemo } from 'react';
+import { useEffect, useMemo, ReactNode } from 'react';
 
 import { QueryBuilderContext } from './context';
 import { useLocalStorage } from './hooks';
@@ -13,8 +13,7 @@ export function QueryBuilder(
   props: Omit<QueryBuilderProps, 'apiUrl'> & {
     displayPrivateItems?: boolean;
     apiUrl: string | null;
-    disableLimitEnforcing?: boolean;
-    children?: React.ReactNode;
+    children?: ReactNode;
   }
 ) {
   const {
diff --git a/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilderExtras.tsx b/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilderExtras.tsx
index d499375154..d43f53e34d 100644
--- a/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilderExtras.tsx
+++ b/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilderExtras.tsx
@@ -33,7 +33,7 @@ import { ORDER_LABEL_BY_TYPE } from './utils/labels';
 import { formatNumber } from './utils/formatters';
 import { TIMEZONES } from './utils/timezones';
 
-const DEFAULT_LIMIT = 5_000;
+const DEFAULT_LIMIT = 0; // no limit
 
 const ALL_TIMEZONES: {
   tzCode: string;
@@ -55,6 +55,7 @@ const LIMIT_OPTIONS: { key: number; label: string }[] = [
   { key: 100, label: '100' },
   { key: 1000, label: '1,000' },
   { key: 5000, label: '5,000' },
+  { key: 50000, label: '50,000' },
   { key: 0, label: 'Default limit' },
 ];
 const LIMIT_OPTION_VALUES = LIMIT_OPTIONS.map((option) => option.key) as number[];
diff --git a/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilderInternals.tsx b/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilderInternals.tsx
index 9966caa44d..670e2cb53c 100644
--- a/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilderInternals.tsx
+++ b/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilderInternals.tsx
@@ -64,17 +64,22 @@ const QueryBuilderInternals = memo(function QueryBuilderInternals() {
           styles={{ padding: '0 1x' }}
           onChange={(tab: string) => setTab(tab as Tab)}
         >
-          <Tab id="results" title="Results" />
-          <Tab id="generated-sql" title="Generated SQL" />
-          <Tab id="sql" title="SQL API" />
-          <Tab id="json" title="REST API" />
-          <Tab id="graphql" title="GraphQL API" />
+          <Tab keepMounted id="results" title="Results">
+            <QueryBuilderResults forceMinHeight={!isChartExpanded} />
+          </Tab>
+          <Tab id="generated-sql" title="Generated SQL">
+            <QueryBuilderGeneratedSQL />
+          </Tab>
+          <Tab id="sql" title="SQL API">
+            <QueryBuilderSQL />
+          </Tab>
+          <Tab id="json" title="REST API">
+            <QueryBuilderRest />
+          </Tab>
+          <Tab id="graphql" title="GraphQL API">
+            <QueryBuilderGraphQL />
+          </Tab>
         </Tabs>
-        {tab === 'results' && <QueryBuilderResults forceMinHeight={!isChartExpanded} />}
-        {tab === 'generated-sql' && <QueryBuilderGeneratedSQL />}
-        {tab === 'json' && <QueryBuilderRest />}
-        {tab === 'sql' && <QueryBuilderSQL />}
-        {tab === 'graphql' && <QueryBuilderGraphQL />}
       </>
     );
   }, [tab, isChartExpanded]);
diff --git a/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilderSQL.tsx b/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilderSQL.tsx
index 2cf56e7bda..f212da0f54 100644
--- a/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilderSQL.tsx
+++ b/packages/cubejs-playground/src/QueryBuilderV2/QueryBuilderSQL.tsx
@@ -16,8 +16,20 @@ export function QueryBuilderSQL() {
     // todo: fix types of normalizedQueries (e.g. order is always an array)
     const [query] = dryRunResponse?.normalizedQueries || [];
 
+    if (isQueryEmpty) {
+      return (
+        <Block padding="1x">
+          <Alert>Compose a query to see an SQL query.</Alert>
+        </Block>
+      );
+    }
+
     if (!query) {
-      return null;
+      return (
+        <Block padding="1x">
+          <Alert>Unable to generate an SQL query.</Alert>
+        </Block>
+      );
     }
 
     if (!isQueryEmpty && meta) {
diff --git a/packages/cubejs-playground/src/QueryBuilderV2/components/SidePanelCubeItem.tsx b/packages/cubejs-playground/src/QueryBuilderV2/components/SidePanelCubeItem.tsx
index 7eff42673e..a30faba2e4 100644
--- a/packages/cubejs-playground/src/QueryBuilderV2/components/SidePanelCubeItem.tsx
+++ b/packages/cubejs-playground/src/QueryBuilderV2/components/SidePanelCubeItem.tsx
@@ -1,4 +1,4 @@
-import { Cube, TCubeDimension, TCubeMeasure, TCubeSegment } from '@cubejs-client/core';
+import { Cube } from '@cubejs-client/core';
 import { ReactElement, useEffect, useMemo, useRef, useState } from 'react';
 import { Block, Button, Space, tasty, Text, CubeIcon, ViewIcon } from '@cube-dev/ui-kit';
 
@@ -589,8 +589,8 @@ export function SidePanelCubeItem(props: CubeListItemProps) {
           ...hierarchyNames.filter((hierarchy) => folder.members.includes(hierarchy)),
           ...dimensions.filter((dimension) => folder.members.includes(dimension)),
         ].sort(sortFn),
-        ...measures.filter((measure) => folder.members.includes(measure)),
-        ...segments.filter((segment) => folder.members.includes(segment))
+        ...measures.filter((measure) => folder.members.includes(measure)).sort(sortFn),
+        ...segments.filter((segment) => folder.members.includes(segment)).sort(sortFn)
       );
 
       return acc;
@@ -606,8 +606,8 @@ export function SidePanelCubeItem(props: CubeListItemProps) {
         (dimension) => !folderMembers.includes(dimension) && !hierarchyMembers.includes(dimension)
       ),
     ].sort(sortFn),
-    ...measures.filter((measure) => !folderMembers.includes(measure)),
-    ...segments.filter((segment) => !folderMembers.includes(segment)),
+    ...measures.filter((measure) => !folderMembers.includes(measure)).sort(sortFn),
+    ...segments.filter((segment) => !folderMembers.includes(segment)).sort(sortFn),
   ];
 
   // When switching between to and from search mode reset the open instances
diff --git a/packages/cubejs-playground/src/QueryBuilderV2/components/Tabs/Tabs.tsx b/packages/cubejs-playground/src/QueryBuilderV2/components/Tabs/Tabs.tsx
index f214b658f9..dfaa71189b 100644
--- a/packages/cubejs-playground/src/QueryBuilderV2/components/Tabs/Tabs.tsx
+++ b/packages/cubejs-playground/src/QueryBuilderV2/components/Tabs/Tabs.tsx
@@ -1,16 +1,57 @@
-import { ReactNode, createContext, useContext, useCallback, useState, useEffect } from 'react';
+import { FocusableRefValue } from '@react-types/shared';
+import {
+  ReactNode,
+  createContext,
+  useContext,
+  useState,
+  useMemo,
+  useLayoutEffect,
+  useRef,
+  useEffect,
+} from 'react';
 import { Action, tasty, CloseIcon, Styles } from '@cube-dev/ui-kit';
 
+import { useEvent } from '../../hooks';
+
+interface TabData {
+  content: ReactNode;
+  prerender: boolean;
+  keepMounted: boolean;
+}
+
 interface TabsContextValue {
   type?: 'default' | 'card';
   size?: 'normal' | 'large';
   activeKey?: string;
   extra?: ReactNode;
-  setContent: (content?: ReactNode) => void;
+  setTabContent: (id: string, content: TabData | null) => void;
+  prerender?: boolean;
+  keepMounted?: boolean;
   onChange: (key: string) => void;
   onDelete?: (key: string) => void;
 }
 
+interface TabsProps extends Omit<TabsContextValue, 'setTabContent'> {
+  label?: string;
+  children?: ReactNode;
+  styles?: Styles;
+  size?: TabsContextValue['size'];
+}
+
+interface TabProps {
+  id: string;
+  title: ReactNode;
+  children?: ReactNode;
+  isDisabled?: boolean;
+  qa?: string;
+  qaVal?: string;
+  styles?: Styles;
+  size?: TabsContextValue['size'];
+  extra?: ReactNode;
+  prerender?: boolean;
+  keepMounted?: boolean;
+}
+
 const TabsContext = createContext<TabsContextValue | undefined>(undefined);
 
 const TabsElement = tasty({
@@ -23,11 +64,15 @@ const TabsElement = tasty({
     shadow: 'inset 0 -1bw 0 #border',
     width: '100%',
     padding: '0 2x',
+    scrollbarWidth: 'none',
 
     Container: {
       display: 'grid',
       gridAutoFlow: 'column',
-      gap: '0',
+      gap: {
+        '': 0,
+        card: '1bw',
+      },
       placeContent: 'start',
     },
 
@@ -49,6 +94,7 @@ const TabContainer = tasty({
 
 const TabElement = tasty(Action, {
   styles: {
+    position: 'relative',
     preset: {
       '': 't3m',
       '[data-size="large"]': 't2m',
@@ -74,6 +120,7 @@ const TabElement = tasty(Action, {
       '': '#dark-02',
       hovered: '#purple',
       active: '#purple-text',
+      'disabled & !active': '#dark-04',
     },
     borderBottom: {
       '': 'none',
@@ -89,11 +136,27 @@ const TabElement = tasty(Action, {
     width: 'max 100%',
     transition: 'theme, borderBottom',
     whiteSpace: 'nowrap',
+    outline: false,
 
     '@delete-padding': {
       '': '1.5x',
       deletable: '4.5x',
     },
+
+    '&::before': {
+      content: '""',
+      display: 'block',
+      position: 'absolute',
+      inset: '0 0 -1ow 0',
+      pointerEvents: 'none',
+      radius: 'top',
+      shadow: {
+        '': 'inset 0 0 0 #purple',
+        focused: 'inset 0 0 0 1ow #purple-03',
+      },
+      transition: 'theme',
+      zIndex: 1,
+    },
   },
 });
 
@@ -122,80 +185,133 @@ const TabCloseButton = tasty(Action, {
   children: <CloseIcon />,
 });
 
-interface TabsProps extends Omit<TabsContextValue, 'setContent'> {
-  label?: string;
-  children?: ReactNode;
-  styles?: Styles;
-  size?: TabsContextValue['size'];
-}
-
-interface TabProps {
-  id: string;
-  title: ReactNode;
-  children?: ReactNode;
-  isDisabled?: boolean;
-  qa?: string;
-  styles?: Styles;
-  size?: TabsContextValue['size'];
-  extra?: ReactNode;
-}
-
 export function Tabs(props: TabsProps) {
-  const [content, setContent] = useState<ReactNode>(null);
-  const { label, activeKey, size, type, onChange, onDelete, children, styles, extra } = props;
+  const [contentMap, setContentMap] = useState<Map<string, TabData>>(new Map());
+  const {
+    label,
+    activeKey,
+    size,
+    type,
+    onChange,
+    onDelete,
+    children,
+    styles,
+    extra,
+    prerender,
+    keepMounted,
+  } = props;
 
   const isCardType = type === 'card';
 
+  // Update the content map whenever the activeKey changes
+  const setTabContent = useEvent((id: string, content: TabData | null) => {
+    setContentMap((prev) => {
+      const newMap = new Map(prev);
+      if (content) {
+        newMap.set(id, content);
+      } else {
+        newMap.delete(id);
+      }
+
+      return newMap;
+    });
+  });
+
+  const mods = useMemo(() => ({ card: isCardType, deletable: !!onDelete }), [isCardType, onDelete]);
+
   return (
-    <TabsContext.Provider value={{ activeKey, onChange, onDelete, type, size, setContent }}>
+    <TabsContext.Provider
+      value={{ activeKey, onChange, onDelete, type, size, setTabContent, prerender, keepMounted }}
+    >
       <TabsElement
         qa="Tabs"
         aria-label={label ?? 'Tabs'}
         data-size={size ?? 'normal'}
-        mods={{ card: isCardType }}
+        mods={mods}
         styles={styles}
       >
         <div data-element="Container">{children}</div>
         {extra ? <div data-element="Extra">{extra}</div> : null}
       </TabsElement>
-      {content}
+      {[...contentMap.entries()].map(([id, { content, prerender, keepMounted }]) =>
+        prerender || id === activeKey || keepMounted ? (
+          <div
+            key={id}
+            data-qa="TabPanel"
+            data-qaval={id}
+            style={{
+              display: id === activeKey ? 'contents' : 'none',
+            }}
+          >
+            {content}
+          </div>
+        ) : null
+      )}
     </TabsContext.Provider>
   );
 }
 
 export function Tab(props: TabProps) {
-  const { title, id, isDisabled, qa, styles, children } = props;
-  const { activeKey, size, type, onChange, onDelete, setContent } = useContext(TabsContext) || {};
+  let { title, id, isDisabled, prerender, keepMounted, qa, qaVal, styles, children } = props;
+
+  const ref = useRef<FocusableRefValue>(null);
+
+  const { activeKey, size, type, onChange, onDelete, setTabContent, ...contextProps } =
+    useContext(TabsContext) || ({} as TabsContextValue);
+
+  prerender = prerender ?? contextProps.prerender;
+  keepMounted = keepMounted ?? contextProps.keepMounted;
 
   const isActive = id === activeKey;
 
-  const onDeleteCallback = useCallback(() => {
+  const onDeleteCallback = useEvent(() => {
     onDelete?.(id);
-  }, [onDelete, id]);
-  const onChangeCallback = useCallback(() => {
+  });
+  const onChangeCallback = useEvent(() => {
     onChange?.(id);
-  }, [id]);
+  });
 
   const isCardType = type === 'card';
-  const isDeletable = onDelete && isCardType;
+  const isDeletable = !!onDelete;
+
+  useLayoutEffect(() => {
+    if (prerender || isActive) {
+      setTabContent?.(id, {
+        content: children,
+        prerender: prerender ?? false,
+        keepMounted: keepMounted ?? false,
+      });
+    } else if (!keepMounted) {
+      setTabContent?.(id, null);
+    }
+  }, [children, isActive, keepMounted, prerender, setTabContent]);
+
+  useLayoutEffect(() => {
+    return () => {
+      setTabContent?.(id, null);
+    };
+  }, []);
+
+  const mods = useMemo(
+    () => ({ card: isCardType, active: isActive, deletable: isDeletable, disabled: isDisabled }),
+    [isCardType, isActive, isDeletable, isDisabled]
+  );
 
   useEffect(() => {
-    if (isActive) {
-      setContent?.(children || null);
+    if (ref.current && isActive) {
+      ref.current.UNSAFE_getDOMNode()?.scrollIntoView?.();
     }
-  }, [activeKey, children]);
+  }, [isActive]);
 
   return (
-    <TabContainer>
+    <TabContainer mods={mods}>
       <TabElement
-        qa={`Tab-${id}` ?? qa}
+        ref={ref}
+        qa={qa ?? `Tab-${id}`}
+        qaVal={qaVal}
         isDisabled={isDisabled}
         styles={styles}
-        mods={{
-          active: isActive,
-          card: isCardType,
-          deletable: isDeletable,
-        }}
+        mods={mods}
         data-size={size}
         onPress={onChangeCallback}
       >
diff --git a/packages/cubejs-playground/src/QueryBuilderV2/utils/validate-query.ts b/packages/cubejs-playground/src/QueryBuilderV2/utils/validate-query.ts
index 111cd86ce5..513f9bcd2a 100644
--- a/packages/cubejs-playground/src/QueryBuilderV2/utils/validate-query.ts
+++ b/packages/cubejs-playground/src/QueryBuilderV2/utils/validate-query.ts
@@ -118,7 +118,7 @@ export function validateQuery(query: Record<string, any>): Query {
     sanitizedQuery.segments = query.segments;
   }
 
-  if (typeof query.limit === 'number') {
+  if (typeof query.limit === 'number' && query.limit > 0) {
     sanitizedQuery.limit = query.limit;
   }
 
diff --git a/packages/cubejs-playground/src/QueryBuilderV2/values.ts b/packages/cubejs-playground/src/QueryBuilderV2/values.ts
index f05d461652..30dae45574 100644
--- a/packages/cubejs-playground/src/QueryBuilderV2/values.ts
+++ b/packages/cubejs-playground/src/QueryBuilderV2/values.ts
@@ -92,12 +92,12 @@ export const OPERATORS_BY_TYPE = {
 export const OPERATORS: Operator[] = [...UNARY_OPERATORS, ...BINARY_OPERATORS];
 
 export const PREDEFINED_GRANULARITIES: TimeDimensionGranularity[] = [
-  'second',
-  'minute',
-  'hour',
-  'day',
-  'week',
-  'month',
-  'quarter',
   'year',
+  'quarter',
+  'month',
+  'week',
+  'day',
+  'hour',
+  'minute',
+  'second',
 ];
diff --git a/packages/cubejs-postgres-driver/CHANGELOG.md b/packages/cubejs-postgres-driver/CHANGELOG.md
index f62344d74f..8ff7110122 100644
--- a/packages/cubejs-postgres-driver/CHANGELOG.md
+++ b/packages/cubejs-postgres-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Bug Fixes
diff --git a/packages/cubejs-postgres-driver/package.json b/packages/cubejs-postgres-driver/package.json
index 44a5287b9a..a9e6d942be 100644
--- a/packages/cubejs-postgres-driver/package.json
+++ b/packages/cubejs-postgres-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/postgres-driver",
   "description": "Cube.js Postgres database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -27,8 +27,8 @@
     "lint:fix": "eslint --fix src/* --ext .ts"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "@types/pg": "^8.6.0",
     "@types/pg-query-stream": "^1.0.3",
     "moment": "^2.24.0",
@@ -37,8 +37,8 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/testing-shared": "1.1.17",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/testing-shared": "1.2.14",
     "testcontainers": "^10.10.4",
     "typescript": "~5.2.2"
   },
diff --git a/packages/cubejs-prestodb-driver/CHANGELOG.md b/packages/cubejs-prestodb-driver/CHANGELOG.md
index 3b59759d8e..ee2b862631 100644
--- a/packages/cubejs-prestodb-driver/CHANGELOG.md
+++ b/packages/cubejs-prestodb-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Bug Fixes
diff --git a/packages/cubejs-prestodb-driver/package.json b/packages/cubejs-prestodb-driver/package.json
index 338a4424d7..8cb892e983 100644
--- a/packages/cubejs-prestodb-driver/package.json
+++ b/packages/cubejs-prestodb-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/prestodb-driver",
   "description": "Cube.js Presto database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -27,8 +27,8 @@
     "lint:fix": "eslint --fix src/* --ext .ts"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "presto-client": "^0.12.2",
     "ramda": "^0.27.0",
     "sqlstring": "^2.3.1"
@@ -38,7 +38,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/jest": "^27",
     "jest": "^27",
     "should": "^13.2.3",
diff --git a/packages/cubejs-query-orchestrator/CHANGELOG.md b/packages/cubejs-query-orchestrator/CHANGELOG.md
index 62a0732b9a..762b1a7341 100644
--- a/packages/cubejs-query-orchestrator/CHANGELOG.md
+++ b/packages/cubejs-query-orchestrator/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Features
diff --git a/packages/cubejs-query-orchestrator/package.json b/packages/cubejs-query-orchestrator/package.json
index 8c662de999..6c2221dbf5 100644
--- a/packages/cubejs-query-orchestrator/package.json
+++ b/packages/cubejs-query-orchestrator/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/query-orchestrator",
   "description": "Cube.js Query Orchestrator and Cache",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -29,18 +29,17 @@
     "dist/src/*"
   ],
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/cubestore-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/cubestore-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "csv-write-stream": "^2.0.0",
-    "es5-ext": "0.10.53",
     "generic-pool": "^3.7.1",
     "ioredis": "^5.4.1",
-    "lru-cache": "^6.0.0",
+    "lru-cache": "^5.1.1",
     "ramda": "^0.27.2"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/generic-pool": "^3.1.9",
     "@types/jest": "^27",
     "@types/node": "^18",
@@ -64,9 +63,5 @@
     "coveragePathIgnorePatterns": [
       ".*\\.d\\.ts"
     ]
-  },
-  "resolutions": {
-    "es5-ext": "0.10.53",
-    "minimist": "^1.2.6"
   }
 }
diff --git a/packages/cubejs-query-orchestrator/src/orchestrator/PreAggregationLoadCache.ts b/packages/cubejs-query-orchestrator/src/orchestrator/PreAggregationLoadCache.ts
new file mode 100644
index 0000000000..5a11b9569a
--- /dev/null
+++ b/packages/cubejs-query-orchestrator/src/orchestrator/PreAggregationLoadCache.ts
@@ -0,0 +1,241 @@
+import { TableStructure } from '@cubejs-backend/base-driver';
+import { DriverFactory } from './DriverFactory';
+import { QueryCache, QueryTuple, QueryWithParams } from './QueryCache';
+import {
+  PreAggregationDescription,
+  PreAggregations,
+  TableCacheEntry,
+  tablesToVersionEntries,
+  VersionEntriesObj,
+  VersionEntry
+} from './PreAggregations';
+
+type PreAggregationLoadCacheOptions = {
+  requestId?: string,
+  dataSource: string,
+  tablePrefixes?: string[],
+};
+
+export class PreAggregationLoadCache {
+  private readonly driverFactory: DriverFactory;
+
+  private queryCache: QueryCache;
+
+  private preAggregations: PreAggregations;
+
+  private readonly queryResults: any;
+
+  private readonly externalDriverFactory: any;
+
+  private readonly requestId: any;
+
+  private versionEntries: { [redisKey: string]: Promise<VersionEntriesObj> };
+
+  private tables: { [redisKey: string]: TableCacheEntry[] };
+
+  private tableColumnTypes: { [cacheKey: string]: { [tableName: string]: TableStructure } };
+
+  // TODO this is in memory cache structure as well however it depends on
+  // data source only and load cache is per data source for now.
+  // Make it per data source key in case load cache scope is broaden.
+  private queryStageState: any;
+
+  private readonly dataSource: string;
+
+  private readonly tablePrefixes: string[] | null;
+
+  public constructor(
+    clientFactory: DriverFactory,
+    queryCache,
+    preAggregations,
+    options: PreAggregationLoadCacheOptions = { dataSource: 'default' }
+  ) {
+    this.dataSource = options.dataSource;
+    this.driverFactory = clientFactory;
+    this.queryCache = queryCache;
+    this.preAggregations = preAggregations;
+    this.queryResults = {};
+    this.externalDriverFactory = preAggregations.externalDriverFactory;
+    this.requestId = options.requestId;
+    this.tablePrefixes = options.tablePrefixes;
+    this.versionEntries = {};
+    this.tables = {};
+    this.tableColumnTypes = {};
+  }
+
+  protected async tablesFromCache(preAggregation, forceRenew: boolean = false) {
+    let tables = forceRenew ? null : await this.queryCache.getCacheDriver().get(this.tablesCachePrefixKey(preAggregation));
+    if (!tables) {
+      tables = await this.preAggregations.getLoadCacheQueue(this.dataSource).executeInQueue(
+        'query',
+        `Fetch tables for ${preAggregation.preAggregationsSchema}`,
+        {
+          preAggregation, requestId: this.requestId
+        },
+        0,
+        { requestId: this.requestId }
+      );
+    }
+    return tables;
+  }
+
+  public async fetchTables(preAggregation: PreAggregationDescription) {
+    if (preAggregation.external && !this.externalDriverFactory) {
+      throw new Error('externalDriverFactory is not provided. Please use CUBEJS_DEV_MODE=true or provide Cube Store connection env variables for production usage.');
+    }
+
+    const newTables = await this.fetchTablesNoCache(preAggregation);
+    await this.queryCache.getCacheDriver().set(
+      this.tablesCachePrefixKey(preAggregation),
+      newTables,
+      this.preAggregations.options.preAggregationsSchemaCacheExpire || 60 * 60
+    );
+    return newTables;
+  }
+
+  private async fetchTablesNoCache(preAggregation: PreAggregationDescription) {
+    const client = preAggregation.external ?
+      await this.externalDriverFactory() :
+      await this.driverFactory();
+    if (this.tablePrefixes && client.getPrefixTablesQuery && this.preAggregations.options.skipExternalCacheAndQueue) {
+      return client.getPrefixTablesQuery(preAggregation.preAggregationsSchema, this.tablePrefixes);
+    }
+    return client.getTablesQuery(preAggregation.preAggregationsSchema);
+  }
+
+  public tablesCachePrefixKey(preAggregation: PreAggregationDescription) {
+    return this.queryCache.getKey('SQL_PRE_AGGREGATIONS_TABLES', `${preAggregation.dataSource}${preAggregation.preAggregationsSchema}${preAggregation.external ? '_EXT' : ''}`);
+  }
+
+  protected async getTablesQuery(preAggregation) {
+    const redisKey = this.tablesCachePrefixKey(preAggregation);
+    if (!this.tables[redisKey]) {
+      const tables = this.preAggregations.options.skipExternalCacheAndQueue && preAggregation.external ?
+        await this.fetchTablesNoCache(preAggregation) :
+        await this.tablesFromCache(preAggregation);
+      if (tables === undefined) {
+        throw new Error('Pre-aggregation tables are undefined.');
+      }
+      this.tables[redisKey] = tables;
+    }
+    return this.tables[redisKey];
+  }
+
+  public async getTableColumnTypes(preAggregation: PreAggregationDescription, tableName: string): Promise<TableStructure> {
+    const prefixKey = this.tablesCachePrefixKey(preAggregation);
+    if (!this.tableColumnTypes[prefixKey]?.[tableName]) {
+      if (!this.preAggregations.options.skipExternalCacheAndQueue && preAggregation.external) {
+        throw new Error(`Lambda union with source data feature is supported only by external rollups stored in Cube Store but was invoked for '${preAggregation.preAggregationId}'`);
+      }
+      const client = await this.externalDriverFactory();
+      const columnTypes = await client.tableColumnTypes(tableName);
+      if (!this.tableColumnTypes[prefixKey]) {
+        this.tableColumnTypes[prefixKey] = {};
+      }
+      this.tableColumnTypes[prefixKey][tableName] = columnTypes;
+    }
+    return this.tableColumnTypes[prefixKey][tableName];
+  }
+
+  private async calculateVersionEntries(preAggregation): Promise<VersionEntriesObj> {
+    let versionEntries = tablesToVersionEntries(
+      preAggregation.preAggregationsSchema,
+      await this.getTablesQuery(preAggregation)
+    );
+    // It presumes strong consistency guarantees for external pre-aggregation tables ingestion
+    if (!preAggregation.external) {
+      const [,, queries] = await this.fetchQueryStageState();
+      const targetTableNamesInQueue = (Object.keys(queries))
+        .map(q => PreAggregations.targetTableName(queries[q].query.newVersionEntry));
+
+      versionEntries = versionEntries.filter(
+        e => targetTableNamesInQueue.indexOf(PreAggregations.targetTableName(e)) === -1
+      );
+    }
+
+    const byContent: { [key: string]: VersionEntry } = {};
+    const byStructure: { [key: string]: VersionEntry } = {};
+    const byTableName: { [key: string]: VersionEntry } = {};
+
+    versionEntries.forEach(e => {
+      const contentKey = `${e.table_name}_${e.content_version}`;
+      if (!byContent[contentKey]) {
+        byContent[contentKey] = e;
+      }
+      const structureKey = `${e.table_name}_${e.structure_version}`;
+      if (!byStructure[structureKey]) {
+        byStructure[structureKey] = e;
+      }
+      if (!byTableName[e.table_name]) {
+        byTableName[e.table_name] = e;
+      }
+    });
+
+    return { versionEntries, byContent, byStructure, byTableName };
+  }
+
+  public async getVersionEntries(preAggregation): Promise<VersionEntriesObj> {
+    if (this.tablePrefixes && !this.tablePrefixes.find(p => preAggregation.tableName.split('.')[1].startsWith(p))) {
+      throw new Error(`Load cache tries to load table ${preAggregation.tableName} outside of tablePrefixes filter: ${this.tablePrefixes.join(', ')}`);
+    }
+    const redisKey = this.tablesCachePrefixKey(preAggregation);
+    if (!this.versionEntries[redisKey]) {
+      this.versionEntries[redisKey] = this.calculateVersionEntries(preAggregation).catch(e => {
+        delete this.versionEntries[redisKey];
+        throw e;
+      });
+    }
+    return this.versionEntries[redisKey];
+  }
+
+  public async keyQueryResult(sqlQuery: QueryWithParams, waitForRenew: boolean, priority: number) {
+    const [query, values, queryOptions]: QueryTuple = Array.isArray(sqlQuery) ? sqlQuery : [sqlQuery, [], {}];
+
+    if (!this.queryResults[this.queryCache.queryRedisKey([query, values])]) {
+      this.queryResults[this.queryCache.queryRedisKey([query, values])] = await this.queryCache.cacheQueryResult(
+        query,
+        <string[]>values,
+        [query, <string[]>values],
+        60 * 60,
+        {
+          renewalThreshold: this.queryCache.options.refreshKeyRenewalThreshold
+            || queryOptions?.renewalThreshold || 2 * 60,
+          renewalKey: [query, values],
+          waitForRenew,
+          priority,
+          requestId: this.requestId,
+          dataSource: this.dataSource,
+          useInMemory: true,
+          external: queryOptions?.external
+        }
+      );
+    }
+    return this.queryResults[this.queryCache.queryRedisKey([query, values])];
+  }
+
+  public hasKeyQueryResult(keyQuery) {
+    return !!this.queryResults[this.queryCache.queryRedisKey(keyQuery)];
+  }
+
+  public async getQueryStage(stageQueryKey) {
+    const queue = await this.preAggregations.getQueue(this.dataSource);
+    await this.fetchQueryStageState(queue);
+    return queue.getQueryStage(stageQueryKey, undefined, this.queryStageState);
+  }
+
+  protected async fetchQueryStageState(queue?) {
+    queue = queue || await this.preAggregations.getQueue(this.dataSource);
+    if (!this.queryStageState) {
+      this.queryStageState = await queue.fetchQueryStageState();
+    }
+    return this.queryStageState;
+  }
+
+  public async reset(preAggregation) {
+    await this.tablesFromCache(preAggregation, true);
+    this.tables = {};
+    this.tableColumnTypes = {};
+    this.queryStageState = undefined;
+    this.versionEntries = {};
+  }
+}
diff --git a/packages/cubejs-query-orchestrator/src/orchestrator/PreAggregationLoader.ts b/packages/cubejs-query-orchestrator/src/orchestrator/PreAggregationLoader.ts
new file mode 100644
index 0000000000..f559998a56
--- /dev/null
+++ b/packages/cubejs-query-orchestrator/src/orchestrator/PreAggregationLoader.ts
@@ -0,0 +1,1047 @@
+import R from 'ramda';
+import { getEnv, MaybeCancelablePromise } from '@cubejs-backend/shared';
+import {
+  cancelCombinator,
+  DownloadQueryResultsResult,
+  DownloadTableData,
+  DriverCapabilities,
+  DriverInterface,
+  isDownloadTableCSVData,
+  SaveCancelFn,
+  StreamOptions,
+  UnloadOptions
+} from '@cubejs-backend/base-driver';
+import { DriverFactory } from './DriverFactory';
+import { QueryCache, QueryTuple } from './QueryCache';
+import { ContinueWaitError } from './ContinueWaitError';
+import { LargeStreamWarning } from './StreamObjectsCounter';
+import {
+  getStructureVersion,
+  InvalidationKeys,
+  LoadPreAggregationResult,
+  PreAggregations,
+  tablesToVersionEntries,
+  version,
+  VersionEntriesObj,
+  VersionEntry
+} from './PreAggregations';
+import { PreAggregationLoadCache } from './PreAggregationLoadCache';
+
+type IndexesSql = { sql: [string, unknown[]], indexName: string }[];
+
+type QueryKey = [QueryTuple, IndexesSql, InvalidationKeys] | [QueryTuple, InvalidationKeys];
+
+type QueryOptions = {
+  queryKey: QueryKey;
+  newVersionEntry: VersionEntry;
+  query: string;
+  values: unknown[];
+  requestId: string;
+  buildRangeEnd?: string;
+};
+
+// There are community developed and custom drivers which not always up-to-date with latest BaseDriver.
+// Extra defence for drivers that don't expose now() yet.
+function nowTimestamp(client: DriverInterface) {
+  return client.nowTimestamp?.() ?? new Date().getTime();
+}
+
+export class PreAggregationLoader {
+  private preAggregations: PreAggregations;
+
+  public preAggregation: any;
+
+  private preAggregationsTablesToTempTables: any;
+
+  /**
+   * Determines whether current instance instantiated for a jobbed build query
+   * (initialized by the /cubejs-system/v1/pre-aggregations/jobs endpoint) or
+   * not.
+   */
+  private readonly isJob: boolean;
+
+  private readonly waitForRenew: boolean;
+
+  private readonly forceBuild: boolean;
+
+  private readonly orphanedTimeout: number;
+
+  private readonly externalDriverFactory: DriverFactory;
+
+  private readonly requestId: string;
+
+  private readonly metadata: any;
+
+  private readonly structureVersionPersistTime: any;
+
+  private readonly externalRefresh: boolean;
+
+  public constructor(
+    private readonly driverFactory: DriverFactory,
+    private readonly logger: any,
+    private readonly queryCache: QueryCache,
+    preAggregations: PreAggregations,
+    preAggregation,
+    preAggregationsTablesToTempTables,
+    private readonly loadCache: PreAggregationLoadCache,
+    options: any = {}
+  ) {
+    this.preAggregations = preAggregations;
+    this.preAggregation = preAggregation;
+    this.preAggregationsTablesToTempTables = preAggregationsTablesToTempTables;
+    this.isJob = !!options.isJob;
+    this.waitForRenew = options.waitForRenew;
+    this.forceBuild = options.forceBuild;
+    this.orphanedTimeout = options.orphanedTimeout;
+    this.externalDriverFactory = preAggregations.externalDriverFactory;
+    this.requestId = options.requestId;
+    this.metadata = options.metadata;
+    this.structureVersionPersistTime = preAggregations.structureVersionPersistTime;
+    this.externalRefresh = options.externalRefresh;
+
+    if (this.externalRefresh && this.waitForRenew) {
+      const message = 'Invalid configuration - when externalRefresh is true, it will not perform a renew, therefore you cannot wait for it using waitForRenew.';
+      if (['production', 'test'].includes(getEnv('nodeEnv'))) {
+        throw new Error(message);
+      } else {
+        this.logger('Invalid Configuration', {
+          requestId: this.requestId,
+          warning: message,
+        });
+        this.waitForRenew = false;
+      }
+    }
+  }
+
+  public async loadPreAggregation(
+    throwOnMissingPartition: boolean,
+  ): Promise<null | LoadPreAggregationResult> {
+    const notLoadedKey = (this.preAggregation.invalidateKeyQueries || [])
+      .find(keyQuery => !this.loadCache.hasKeyQueryResult(keyQuery));
+
+    if (this.isJob || !(notLoadedKey && !this.waitForRenew)) {
+      // Case 1: pre-agg build job processing.
+      // Case 2: either we have no data cached for this rollup or waitForRenew
+      // is true, either way, synchronously renew what data is needed so that
+      // the most current data will be returned fo the current request.
+      const result = await this.loadPreAggregationWithKeys();
+      const refreshKeyValues = await this.getInvalidationKeyValues();
+      return {
+        ...result,
+        refreshKeyValues,
+        queryKey: this.isJob
+          // We need to return a queryKey value for the jobed build query
+          // (initialized by the /cubejs-system/v1/pre-aggregations/jobs
+          // endpoint) as a part of the response to make it possible to get a
+          // query result from the cache by the other API call.
+          ? this.preAggregationQueryKey(refreshKeyValues)
+          : undefined,
+      };
+    } else {
+      // Case 3: pre-agg exists
+      const structureVersion = getStructureVersion(this.preAggregation);
+      const getVersionsStarted = new Date();
+      const { byStructure } = await this.loadCache.getVersionEntries(this.preAggregation);
+      this.logger('Load PreAggregations Tables', {
+        preAggregation: this.preAggregation,
+        requestId: this.requestId,
+        duration: (new Date().getTime() - getVersionsStarted.getTime())
+      });
+
+      const versionEntryByStructureVersion = byStructure[`${this.preAggregation.tableName}_${structureVersion}`];
+      if (this.externalRefresh) {
+        if (!versionEntryByStructureVersion && throwOnMissingPartition) {
+          // eslint-disable-next-line no-use-before-define
+          throw new Error(PreAggregations.noPreAggregationPartitionsBuiltMessage([this.preAggregation]));
+        }
+        if (!versionEntryByStructureVersion) {
+          return null;
+        } else {
+          // the rollups are being maintained independently of this instance of cube.js
+          // immediately return the latest rollup data that instance already has
+          return {
+            targetTableName: this.targetTableName(versionEntryByStructureVersion),
+            refreshKeyValues: [],
+            lastUpdatedAt: versionEntryByStructureVersion.last_updated_at,
+            buildRangeEnd: versionEntryByStructureVersion.build_range_end,
+          };
+        }
+      }
+
+      if (versionEntryByStructureVersion) {
+        // this triggers an asynchronous/background load of the pre-aggregation but immediately
+        // returns the latest data it already has
+        this.loadPreAggregationWithKeys().catch(e => {
+          if (!(e instanceof ContinueWaitError)) {
+            this.logger('Error loading pre-aggregation', {
+              error: (e.stack || e),
+              preAggregation: this.preAggregation,
+              requestId: this.requestId
+            });
+          }
+        });
+        return {
+          targetTableName: this.targetTableName(versionEntryByStructureVersion),
+          refreshKeyValues: [],
+          lastUpdatedAt: versionEntryByStructureVersion.last_updated_at,
+          buildRangeEnd: versionEntryByStructureVersion.build_range_end,
+        };
+      } else {
+        // no rollup has been built yet - build it synchronously as part of responding to this request
+        return this.loadPreAggregationWithKeys();
+      }
+    }
+  }
+
+  protected async loadPreAggregationWithKeys(): Promise<LoadPreAggregationResult> {
+    const invalidationKeys = await this.getPartitionInvalidationKeyValues();
+
+    const contentVersion = this.contentVersion(invalidationKeys);
+    const structureVersion = getStructureVersion(this.preAggregation);
+
+    const versionEntries = await this.loadCache.getVersionEntries(this.preAggregation);
+
+    const getVersionEntryByContentVersion = ({ byContent }: VersionEntriesObj) => byContent[`${this.preAggregation.tableName}_${contentVersion}`];
+
+    const versionEntryByContentVersion = getVersionEntryByContentVersion(versionEntries);
+    if (versionEntryByContentVersion && !this.forceBuild) {
+      const targetTableName = this.targetTableName(versionEntryByContentVersion);
+      // No need to block here
+      this.updateLastTouch(targetTableName);
+      return {
+        targetTableName,
+        refreshKeyValues: [],
+        lastUpdatedAt: versionEntryByContentVersion.last_updated_at,
+        buildRangeEnd: versionEntryByContentVersion.build_range_end,
+      };
+    }
+
+    if (!this.waitForRenew && !this.forceBuild) {
+      const versionEntryByStructureVersion = versionEntries.byStructure[`${this.preAggregation.tableName}_${structureVersion}`];
+      if (versionEntryByStructureVersion) {
+        const targetTableName = this.targetTableName(versionEntryByStructureVersion);
+        // No need to block here
+        this.updateLastTouch(targetTableName);
+        return {
+          targetTableName,
+          refreshKeyValues: [],
+          lastUpdatedAt: versionEntryByStructureVersion.last_updated_at,
+          buildRangeEnd: versionEntryByStructureVersion.build_range_end,
+        };
+      }
+    }
+
+    const client = this.preAggregation.external ?
+      await this.externalDriverFactory() :
+      await this.driverFactory();
+
+    if (!versionEntries.versionEntries.length) {
+      await client.createSchemaIfNotExists(this.preAggregation.preAggregationsSchema);
+    }
+
+    // ensure we find appropriate structure version before invalidating anything
+    const versionEntry =
+      versionEntries.byStructure[`${this.preAggregation.tableName}_${structureVersion}`] ||
+      versionEntries.byTableName[this.preAggregation.tableName];
+
+    const newVersionEntry: VersionEntry = {
+      table_name: this.preAggregation.tableName,
+      structure_version: structureVersion,
+      content_version: contentVersion,
+      last_updated_at: nowTimestamp(client),
+      naming_version: 2,
+    };
+
+    const mostRecentResult: () => Promise<LoadPreAggregationResult> = async () => {
+      await this.loadCache.reset(this.preAggregation);
+      const lastVersion = getVersionEntryByContentVersion(
+        await this.loadCache.getVersionEntries(this.preAggregation)
+      );
+      if (!lastVersion) {
+        throw new Error(`Pre-aggregation table is not found for ${this.preAggregation.tableName} after it was successfully created`);
+      }
+      const targetTableName = this.targetTableName(lastVersion);
+      this.updateLastTouch(targetTableName);
+      return {
+        targetTableName,
+        refreshKeyValues: [],
+        lastUpdatedAt: lastVersion.last_updated_at,
+        buildRangeEnd: lastVersion.build_range_end,
+      };
+    };
+
+    if (this.forceBuild) {
+      this.logger('Force build pre-aggregation', {
+        preAggregation: this.preAggregation,
+        requestId: this.requestId,
+        metadata: this.metadata,
+        queryKey: this.preAggregationQueryKey(invalidationKeys),
+        newVersionEntry
+      });
+      if (this.isJob) {
+        // We don't want to wait for the jobed build query result. So we run the
+        // executeInQueue method and immediately return the LoadPreAggregationResult object.
+        this
+          .executeInQueue(invalidationKeys, this.priority(10), newVersionEntry)
+          .catch((e: any) => {
+            this.logger('Pre-aggregations build job error', {
+              preAggregation: this.preAggregation,
+              requestId: this.requestId,
+              newVersionEntry,
+              error: (e.stack || e),
+            });
+          });
+        const targetTableName = this.targetTableName(newVersionEntry);
+        this.updateLastTouch(targetTableName);
+        return {
+          targetTableName,
+          refreshKeyValues: [],
+          lastUpdatedAt: newVersionEntry.last_updated_at,
+          buildRangeEnd: this.preAggregation.buildRangeEnd,
+        };
+      } else {
+        await this.executeInQueue(invalidationKeys, this.priority(10), newVersionEntry);
+        return mostRecentResult();
+      }
+    }
+
+    if (versionEntry) {
+      if (versionEntry.structure_version !== newVersionEntry.structure_version) {
+        this.logger('Invalidating pre-aggregation structure', {
+          preAggregation: this.preAggregation,
+          requestId: this.requestId,
+          queryKey: this.preAggregationQueryKey(invalidationKeys),
+          newVersionEntry
+        });
+        await this.executeInQueue(invalidationKeys, this.priority(10), newVersionEntry);
+        return mostRecentResult();
+      } else if (versionEntry.content_version !== newVersionEntry.content_version) {
+        if (this.waitForRenew) {
+          this.logger('Waiting for pre-aggregation renew', {
+            preAggregation: this.preAggregation,
+            requestId: this.requestId,
+            queryKey: this.preAggregationQueryKey(invalidationKeys),
+            newVersionEntry
+          });
+          await this.executeInQueue(invalidationKeys, this.priority(0), newVersionEntry);
+          return mostRecentResult();
+        } else {
+          this.scheduleRefresh(invalidationKeys, newVersionEntry);
+        }
+      }
+    } else {
+      this.logger('Creating pre-aggregation from scratch', {
+        preAggregation: this.preAggregation,
+        requestId: this.requestId,
+        queryKey: this.preAggregationQueryKey(invalidationKeys),
+        newVersionEntry
+      });
+      await this.executeInQueue(invalidationKeys, this.priority(10), newVersionEntry);
+      return mostRecentResult();
+    }
+    const targetTableName = this.targetTableName(versionEntry);
+    this.updateLastTouch(targetTableName);
+    return {
+      targetTableName,
+      refreshKeyValues: [],
+      lastUpdatedAt: versionEntry.last_updated_at,
+      buildRangeEnd: versionEntry.build_range_end,
+    };
+  }
+
+  private updateLastTouch(tableName: string) {
+    this.preAggregations.updateLastTouch(tableName).catch(e => {
+      this.logger('Error on pre-aggregation touch', {
+        error: (e.stack || e), preAggregation: this.preAggregation, requestId: this.requestId,
+      });
+    });
+  }
+
+  protected contentVersion(invalidationKeys: InvalidationKeys) {
+    const versionArray = [this.preAggregation.structureVersionLoadSql || this.preAggregation.loadSql];
+    if (this.preAggregation.indexesSql && this.preAggregation.indexesSql.length) {
+      versionArray.push(this.preAggregation.indexesSql);
+    }
+    if (this.preAggregation.streamOffset) {
+      versionArray.push(this.preAggregation.streamOffset);
+    }
+    if (this.preAggregation.outputColumnTypes) {
+      versionArray.push(this.preAggregation.outputColumnTypes);
+    }
+    versionArray.push(invalidationKeys);
+    return version(versionArray);
+  }
+
+  protected priority(defaultValue: number): number {
+    return this.preAggregation.priority != null ? this.preAggregation.priority : defaultValue;
+  }
+
+  protected getInvalidationKeyValues() {
+    return Promise.all(
+      (this.preAggregation.invalidateKeyQueries || []).map(
+        (sqlQuery) => this.loadCache.keyQueryResult(sqlQuery, this.waitForRenew, this.priority(10))
+      )
+    );
+  }
+
+  protected getPartitionInvalidationKeyValues() {
+    if (this.preAggregation.partitionInvalidateKeyQueries) {
+      return Promise.all(
+        (this.preAggregation.partitionInvalidateKeyQueries || []).map(
+          (sqlQuery) => this.loadCache.keyQueryResult(sqlQuery, this.waitForRenew, this.priority(10))
+        )
+      );
+    } else {
+      return this.getInvalidationKeyValues();
+    }
+  }
+
+  protected scheduleRefresh(invalidationKeys: InvalidationKeys, newVersionEntry: VersionEntry) {
+    this.logger('Refreshing pre-aggregation content', {
+      preAggregation: this.preAggregation,
+      requestId: this.requestId,
+      queryKey: this.preAggregationQueryKey(invalidationKeys),
+      newVersionEntry
+    });
+    this.executeInQueue(invalidationKeys, this.priority(0), newVersionEntry)
+      .catch(e => {
+        if (!(e instanceof ContinueWaitError)) {
+          this.logger('Error refreshing pre-aggregation', {
+            error: (e.stack || e), preAggregation: this.preAggregation, requestId: this.requestId
+          });
+        }
+      });
+  }
+
+  protected async executeInQueue(invalidationKeys: InvalidationKeys, priority: number, newVersionEntry: VersionEntry) {
+    const queue = await this.preAggregations.getQueue(this.preAggregation.dataSource);
+    return queue.executeInQueue(
+      'query',
+      this.preAggregationQueryKey(invalidationKeys),
+      {
+        preAggregation: this.preAggregation,
+        preAggregationsTablesToTempTables: this.preAggregationsTablesToTempTables,
+        newVersionEntry,
+        requestId: this.requestId,
+        invalidationKeys,
+        forceBuild: this.forceBuild,
+        isJob: this.isJob,
+        metadata: this.metadata,
+        orphanedTimeout: this.orphanedTimeout,
+      },
+      priority,
+      // eslint-disable-next-line no-use-before-define
+      { stageQueryKey: PreAggregations.preAggregationQueryCacheKey(this.preAggregation), requestId: this.requestId }
+    );
+  }
+
+  protected preAggregationQueryKey(invalidationKeys: InvalidationKeys): QueryKey {
+    return this.preAggregation.indexesSql && this.preAggregation.indexesSql.length ?
+      [this.preAggregation.loadSql, this.preAggregation.indexesSql, invalidationKeys] :
+      [this.preAggregation.loadSql, invalidationKeys];
+  }
+
+  protected targetTableName(versionEntry: VersionEntry): string {
+    // eslint-disable-next-line no-use-before-define
+    return PreAggregations.targetTableName(versionEntry);
+  }
+
+  public refresh(newVersionEntry: VersionEntry, invalidationKeys: InvalidationKeys, client) {
+    this.updateLastTouch(this.targetTableName(newVersionEntry));
+    let refreshStrategy = this.refreshStoreInSourceStrategy;
+    if (this.preAggregation.external) {
+      const readOnly =
+        this.preAggregation.readOnly ||
+        client.config && client.config.readOnly ||
+        client.readOnly && (typeof client.readOnly === 'boolean' ? client.readOnly : client.readOnly());
+
+      if (readOnly) {
+        refreshStrategy = this.refreshReadOnlyExternalStrategy;
+      } else {
+        refreshStrategy = this.refreshWriteStrategy;
+      }
+    }
+    return cancelCombinator(
+      saveCancelFn => refreshStrategy.bind(this)(
+        client,
+        newVersionEntry,
+        saveCancelFn,
+        invalidationKeys
+      )
+    );
+  }
+
+  protected logExecutingSql(payload) {
+    this.logger(
+      'Executing Load Pre Aggregation SQL',
+      payload
+    );
+  }
+
+  protected queryOptions(invalidationKeys: InvalidationKeys, query: string, params: unknown[], targetTableName: string, newVersionEntry: VersionEntry) {
+    return {
+      queryKey: this.preAggregationQueryKey(invalidationKeys),
+      query,
+      values: params,
+      targetTableName,
+      requestId: this.requestId,
+      newVersionEntry,
+      buildRangeEnd: this.preAggregation.buildRangeEnd,
+    };
+  }
+
+  protected async refreshStoreInSourceStrategy(
+    client: DriverInterface,
+    newVersionEntry: VersionEntry,
+    saveCancelFn: SaveCancelFn,
+    invalidationKeys: InvalidationKeys
+  ) {
+    const [loadSql, params] =
+      Array.isArray(this.preAggregation.loadSql) ? this.preAggregation.loadSql : [this.preAggregation.loadSql, []];
+    const targetTableName = this.targetTableName(newVersionEntry);
+    const query = (
+      <string>QueryCache.replacePreAggregationTableNames(
+        loadSql,
+        this.preAggregationsTablesToTempTables,
+      )
+    ).replace(
+      this.preAggregation.tableName,
+      targetTableName
+    );
+    const queryOptions = this.queryOptions(invalidationKeys, query, params, targetTableName, newVersionEntry);
+    this.logExecutingSql(queryOptions);
+
+    try {
+      // TODO move index creation to the driver
+      await saveCancelFn(client.loadPreAggregationIntoTable(
+        targetTableName,
+        query,
+        params,
+        {
+          streamOffset: this.preAggregation.streamOffset,
+          outputColumnTypes: this.preAggregation.outputColumnTypes,
+          ...queryOptions
+        }
+      ));
+
+      await this.createIndexes(client, newVersionEntry, saveCancelFn, queryOptions);
+      await this.loadCache.fetchTables(this.preAggregation);
+    } finally {
+      // We must clean orphaned in any cases: success or exception
+      await this.dropOrphanedTables(client, targetTableName, saveCancelFn, false, queryOptions);
+      await this.loadCache.fetchTables(this.preAggregation);
+    }
+  }
+
+  protected async refreshWriteStrategy(
+    client: DriverInterface,
+    newVersionEntry: VersionEntry,
+    saveCancelFn: SaveCancelFn,
+    invalidationKeys: InvalidationKeys,
+  ) {
+    const capabilities = client?.capabilities();
+
+    const withTempTable = !(capabilities?.unloadWithoutTempTable);
+    const dropSourceTempTable = !capabilities?.streamingSource;
+
+    return this.runWriteStrategy(
+      client,
+      newVersionEntry,
+      saveCancelFn,
+      invalidationKeys,
+      withTempTable,
+      dropSourceTempTable
+    );
+  }
+
+  /**
+   * Runs export strategy with write access in data source
+   */
+  protected async runWriteStrategy(
+    client: DriverInterface,
+    newVersionEntry: VersionEntry,
+    saveCancelFn: SaveCancelFn,
+    invalidationKeys: InvalidationKeys,
+    withTempTable: boolean,
+    dropSourceTempTable: boolean,
+  ) {
+    if (withTempTable) {
+      await client.createSchemaIfNotExists(this.preAggregation.preAggregationsSchema);
+    }
+    const targetTableName = this.targetTableName(newVersionEntry);
+    const queryOptions = await this.prepareWriteStrategy(
+      client,
+      targetTableName,
+      newVersionEntry,
+      saveCancelFn,
+      invalidationKeys,
+      withTempTable,
+    );
+
+    try {
+      const tableData = await this.downloadExternalPreAggregation(
+        client,
+        newVersionEntry,
+        saveCancelFn,
+        queryOptions,
+        withTempTable,
+      );
+
+      try {
+        await this.uploadExternalPreAggregation(tableData, newVersionEntry, saveCancelFn, queryOptions);
+      } finally {
+        if (tableData && tableData.release) {
+          await tableData.release();
+        }
+      }
+    } finally {
+      await this.cleanupWriteStrategy(
+        client,
+        targetTableName,
+        queryOptions,
+        saveCancelFn,
+        withTempTable,
+        dropSourceTempTable,
+      );
+    }
+  }
+
+  /**
+   * Cleanup tables after write strategy
+   */
+  protected async cleanupWriteStrategy(
+    client: DriverInterface,
+    targetTableName: string,
+    queryOptions: QueryOptions,
+    saveCancelFn: SaveCancelFn,
+    withTempTable: boolean,
+    dropSourceTempTable: boolean,
+  ) {
+    if (withTempTable && dropSourceTempTable) {
+      await this.withDropLock(false, async () => {
+        this.logger('Dropping source temp table', queryOptions);
+
+        const actualTables = await client.getTablesQuery(this.preAggregation.preAggregationsSchema);
+        const mappedActualTables = actualTables.map(t => `${this.preAggregation.preAggregationsSchema}.${t.table_name || t.TABLE_NAME}`);
+        if (mappedActualTables.includes(targetTableName)) {
+          await client.dropTable(targetTableName);
+        }
+      });
+    }
+
+    // We must clean orphaned in any cases: success or exception
+    await this.loadCache.fetchTables(this.preAggregation);
+    await this.dropOrphanedTables(client, targetTableName, saveCancelFn, false, queryOptions);
+  }
+
+  /**
+   * Create table (if required) and prepares query options object
+   */
+  protected async prepareWriteStrategy(
+    client: DriverInterface,
+    targetTableName: string,
+    newVersionEntry: VersionEntry,
+    saveCancelFn: SaveCancelFn,
+    invalidationKeys: InvalidationKeys,
+    withTempTable: boolean
+  ): Promise<QueryOptions> {
+    if (withTempTable) {
+      const [loadSql, params] =
+        Array.isArray(this.preAggregation.loadSql) ? this.preAggregation.loadSql : [this.preAggregation.loadSql, []];
+
+      const query = (
+        <string>QueryCache.replacePreAggregationTableNames(
+          loadSql,
+          this.preAggregationsTablesToTempTables,
+        )
+      ).replace(
+        this.preAggregation.tableName,
+        targetTableName
+      );
+      const queryOptions = this.queryOptions(invalidationKeys, query, params, targetTableName, newVersionEntry);
+      this.logExecutingSql(queryOptions);
+      await saveCancelFn(client.loadPreAggregationIntoTable(
+        targetTableName,
+        query,
+        params,
+        {
+          streamOffset: this.preAggregation.streamOffset,
+          outputColumnTypes: this.preAggregation.outputColumnTypes,
+          ...queryOptions
+        }
+      ));
+
+      return queryOptions;
+    } else {
+      const [sql, params] =
+        Array.isArray(this.preAggregation.sql) ? this.preAggregation.sql : [this.preAggregation.sql, []];
+      const queryOptions = this.queryOptions(invalidationKeys, sql, params, targetTableName, newVersionEntry);
+      this.logExecutingSql(queryOptions);
+      return queryOptions;
+    }
+  }
+
+  /**
+   * Strategy to copy pre-aggregation from source db (for read-only permissions) to external data
+   */
+  protected async refreshReadOnlyExternalStrategy(
+    client: DriverInterface,
+    newVersionEntry: VersionEntry,
+    saveCancelFn: SaveCancelFn,
+    invalidationKeys: InvalidationKeys
+  ) {
+    const [sql, params] =
+      Array.isArray(this.preAggregation.sql) ? this.preAggregation.sql : [this.preAggregation.sql, []];
+
+    const queryOptions = this.queryOptions(invalidationKeys, sql, params, this.targetTableName(newVersionEntry), newVersionEntry);
+    this.logExecutingSql(queryOptions);
+    this.logger('Downloading external pre-aggregation via query', queryOptions);
+    const externalDriver = await this.externalDriverFactory();
+    const capabilities = externalDriver.capabilities && externalDriver.capabilities();
+
+    let tableData: DownloadQueryResultsResult;
+
+    if (capabilities.csvImport && client.unloadFromQuery && await client.isUnloadSupported(this.getUnloadOptions())) {
+      tableData = await saveCancelFn(
+        client.unloadFromQuery(
+          sql,
+          params,
+          this.getUnloadOptions(),
+        )
+      ).catch((error: any) => {
+        this.logger('Downloading external pre-aggregation via query error', {
+          ...queryOptions,
+          error: error.stack || error.message
+        });
+        throw error;
+      });
+    } else {
+      tableData = await saveCancelFn(client.downloadQueryResults(
+        sql,
+        params, {
+          streamOffset: this.preAggregation.streamOffset,
+          outputColumnTypes: this.preAggregation.outputColumnTypes,
+          ...queryOptions,
+          ...capabilities,
+          ...this.getStreamingOptions(),
+        }
+      )).catch((error: any) => {
+        this.logger('Downloading external pre-aggregation via query error', {
+          ...queryOptions,
+          error: error.stack || error.message
+        });
+        throw error;
+      });
+    }
+
+    this.logger('Downloading external pre-aggregation via query completed', {
+      ...queryOptions,
+      isUnloadSupported: isDownloadTableCSVData(tableData)
+    });
+
+    try {
+      await this.uploadExternalPreAggregation(tableData, newVersionEntry, saveCancelFn, queryOptions);
+    } finally {
+      if (tableData.release) {
+        await tableData.release();
+      }
+    }
+
+    await this.loadCache.fetchTables(this.preAggregation);
+  }
+
+  protected getUnloadOptions(): UnloadOptions {
+    return {
+      // Default: 16mb for Snowflake, Should be specified in MBs, because drivers convert it
+      maxFileSize: 64
+    };
+  }
+
+  protected getStreamingOptions(): StreamOptions {
+    return {
+      // Default: 16384 (16KB), or 16 for objectMode streams. PostgreSQL/MySQL use object streams
+      highWaterMark: 10000
+    };
+  }
+
+  /**
+   * prepares download data for future cube store usage
+   */
+  protected async downloadExternalPreAggregation(
+    client: DriverInterface,
+    newVersionEntry: VersionEntry,
+    saveCancelFn: SaveCancelFn,
+    queryOptions: QueryOptions,
+    withTempTable: boolean
+  ) {
+    const table = this.targetTableName(newVersionEntry);
+    this.logger('Downloading external pre-aggregation', queryOptions);
+
+    try {
+      const externalDriver = await this.externalDriverFactory();
+      const capabilities = externalDriver.capabilities && externalDriver.capabilities();
+
+      let tableData: DownloadTableData;
+      if (withTempTable) {
+        tableData = await this.getTableDataWithTempTable(client, table, saveCancelFn, queryOptions, capabilities);
+      } else {
+        tableData = await this.getTableDataWithoutTempTable(client, table, saveCancelFn, queryOptions, capabilities);
+      }
+
+      this.logger('Downloading external pre-aggregation completed', {
+        ...queryOptions,
+        isUnloadSupported: isDownloadTableCSVData(tableData)
+      });
+
+      return tableData;
+    } catch (error: any) {
+      this.logger('Downloading external pre-aggregation error', {
+        ...queryOptions,
+        error: error?.stack || error?.message
+      });
+      throw error;
+    }
+  }
+
+  /**
+   * prepares download data when temp table = true
+   */
+  protected async getTableDataWithTempTable(client: DriverInterface, table: string, saveCancelFn: SaveCancelFn, queryOptions: QueryOptions, externalDriverCapabilities: DriverCapabilities) {
+    let tableData: DownloadTableData;
+
+    if (externalDriverCapabilities.csvImport && client.unload && await client.isUnloadSupported(this.getUnloadOptions())) {
+      tableData = await saveCancelFn(
+        client.unload(table, this.getUnloadOptions()),
+      );
+    } else if (externalDriverCapabilities.streamImport && client.stream) {
+      tableData = await saveCancelFn(
+        client.stream(`SELECT * FROM ${table}`, [], this.getStreamingOptions())
+      );
+
+      if (client.unload) {
+        const stream = new LargeStreamWarning(this.preAggregation.preAggregationId, (msg) => {
+          this.logger('Downloading external pre-aggregation warning', {
+            ...queryOptions,
+            error: msg
+          });
+        });
+        tableData.rowStream.pipe(stream);
+        tableData.rowStream = stream;
+      }
+    } else {
+      tableData = await saveCancelFn(client.downloadTable(table, {
+        streamOffset: this.preAggregation.streamOffset,
+        outputColumnTypes: this.preAggregation.outputColumnTypes,
+        ...externalDriverCapabilities
+      }));
+    }
+
+    if (!tableData.types) {
+      tableData.types = await saveCancelFn(client.tableColumnTypes(table));
+    }
+
+    return tableData;
+  }
+
+  /**
+   * prepares download data when temp table = false
+   */
+  protected async getTableDataWithoutTempTable(client: DriverInterface, table: string, saveCancelFn: SaveCancelFn, queryOptions: QueryOptions, externalDriverCapabilities: DriverCapabilities) {
+    const [sql, params] =
+      Array.isArray(this.preAggregation.sql) ? this.preAggregation.sql : [this.preAggregation.sql, []];
+
+    let tableData: DownloadTableData;
+
+    if (externalDriverCapabilities.csvImport && client.unload && await client.isUnloadSupported(this.getUnloadOptions())) {
+      return saveCancelFn(
+        client.unload(
+          table,
+          { ...this.getUnloadOptions(), query: { sql, params } },
+        )
+      );
+    } else if (externalDriverCapabilities.streamImport && client.stream) {
+      tableData = await saveCancelFn(
+        client.stream(sql, params, this.getStreamingOptions())
+      );
+
+      if (client.unload) {
+        const stream = new LargeStreamWarning(this.preAggregation.preAggregationId, (msg) => {
+          this.logger('Downloading external pre-aggregation warning', {
+            ...queryOptions,
+            error: msg
+          });
+        });
+        tableData.rowStream.pipe(stream);
+        tableData.rowStream = stream;
+      }
+    } else {
+      tableData = { rows: await saveCancelFn(client.query(sql, params)) };
+    }
+
+    if (!tableData.types && client.queryColumnTypes) {
+      tableData.types = await saveCancelFn(client.queryColumnTypes(sql, params));
+    }
+
+    return tableData;
+  }
+
+  protected async uploadExternalPreAggregation(
+    tableData: DownloadTableData,
+    newVersionEntry: VersionEntry,
+    saveCancelFn: SaveCancelFn,
+    queryOptions: QueryOptions
+  ) {
+    const externalDriver: DriverInterface = await this.externalDriverFactory();
+    const table = this.targetTableName(newVersionEntry);
+
+    this.logger('Uploading external pre-aggregation', queryOptions);
+    await saveCancelFn(
+      externalDriver.uploadTableWithIndexes(
+        table,
+        tableData.types,
+        tableData,
+        this.prepareIndexesSql(newVersionEntry, queryOptions),
+        this.preAggregation.uniqueKeyColumns,
+        queryOptions,
+        {
+          aggregationsColumns: this.preAggregation.aggregationsColumns,
+          createTableIndexes: this.prepareCreateTableIndexes(newVersionEntry),
+          sealAt: this.preAggregation.sealAt
+        }
+      )
+    ).catch((error: any) => {
+      this.logger('Uploading external pre-aggregation error', {
+        ...queryOptions,
+        error: error?.stack || error?.message
+      });
+      throw error;
+    });
+    this.logger('Uploading external pre-aggregation completed', queryOptions);
+
+    await this.loadCache.fetchTables(this.preAggregation);
+    await this.dropOrphanedTables(externalDriver, table, saveCancelFn, true, queryOptions);
+  }
+
+  protected async createIndexes(driver, newVersionEntry: VersionEntry, saveCancelFn: SaveCancelFn, queryOptions: QueryOptions) {
+    const indexesSql = this.prepareIndexesSql(newVersionEntry, queryOptions);
+    for (let i = 0; i < indexesSql.length; i++) {
+      const [query, params] = indexesSql[i].sql;
+      await saveCancelFn(driver.query(query, params));
+    }
+  }
+
+  protected prepareIndexesSql(newVersionEntry: VersionEntry, queryOptions: QueryOptions) {
+    if (!this.preAggregation.indexesSql || !this.preAggregation.indexesSql.length) {
+      return [];
+    }
+    return this.preAggregation.indexesSql.map(({ sql, indexName }) => {
+      const [query, params] = sql;
+      const indexVersionEntry = {
+        ...newVersionEntry,
+        table_name: indexName
+      };
+      this.logger('Creating pre-aggregation index', queryOptions);
+      const resultingSql = QueryCache.replacePreAggregationTableNames(
+        query,
+        this.preAggregationsTablesToTempTables.concat([
+          [this.preAggregation.tableName, { targetTableName: this.targetTableName(newVersionEntry) }],
+          [indexName, { targetTableName: this.targetTableName(indexVersionEntry) }]
+        ])
+      );
+      return { sql: [resultingSql, params] };
+    });
+  }
+
+  protected prepareCreateTableIndexes(newVersionEntry: VersionEntry) {
+    if (!this.preAggregation.createTableIndexes || !this.preAggregation.createTableIndexes.length) {
+      return [];
+    }
+    return this.preAggregation.createTableIndexes.map(({ indexName, type, columns }) => {
+      const indexVersionEntry = {
+        ...newVersionEntry,
+        table_name: indexName
+      };
+      return { indexName: this.targetTableName(indexVersionEntry), type, columns };
+    });
+  }
+
+  private async withDropLock<T>(external: boolean, lockFn: () => MaybeCancelablePromise<T>): Promise<boolean> {
+    const lockKey = this.dropLockKey(external);
+    return this.queryCache.withLock(lockKey, 60 * 5, lockFn);
+  }
+
+  protected async dropOrphanedTables(
+    client: DriverInterface,
+    justCreatedTable: string,
+    saveCancelFn: SaveCancelFn,
+    external: boolean,
+    queryOptions: QueryOptions
+  ) {
+    await this.preAggregations.addTableUsed(justCreatedTable);
+
+    return this.withDropLock(external, async () => {
+      this.logger('Dropping orphaned tables', { ...queryOptions, external });
+      const actualTables = await client.getTablesQuery(
+        this.preAggregation.preAggregationsSchema,
+      );
+      const versionEntries = tablesToVersionEntries(
+        this.preAggregation.preAggregationsSchema,
+        actualTables,
+      );
+      const versionEntriesToSave = R.pipe<
+        VersionEntry[],
+        { [index: string]: VersionEntry[] },
+        Array<[string, VersionEntry[]]>,
+        VersionEntry[]
+      >(
+        R.groupBy(v => v.table_name),
+        R.toPairs,
+        R.map(p => p[1][0])
+      )(versionEntries);
+      const structureVersionsToSave = R.pipe<
+        VersionEntry[],
+        VersionEntry[],
+        { [index: string]: VersionEntry[] },
+        Array<[string, VersionEntry[]]>,
+        VersionEntry[]
+      >(
+        R.filter(
+          (v: VersionEntry) => (
+            new Date().getTime() - v.last_updated_at <
+            this.structureVersionPersistTime * 1000
+          )
+        ),
+        R.groupBy(v => `${v.table_name}_${v.structure_version}`),
+        R.toPairs,
+        R.map(p => p[1][0])
+      )(versionEntries);
+
+      const refreshEndReached = await this.preAggregations.getRefreshEndReached();
+      const toSave =
+        this.preAggregations.dropPreAggregationsWithoutTouch && refreshEndReached
+          ? (await this.preAggregations.tablesUsed())
+            .concat(await this.preAggregations.tablesTouched())
+            .concat([justCreatedTable])
+          : (await this.preAggregations.tablesUsed())
+            .concat(structureVersionsToSave.map(v => this.targetTableName(v)))
+            .concat(versionEntriesToSave.map(v => this.targetTableName(v)))
+            .concat([justCreatedTable]);
+      const toDrop = actualTables
+        .map(t => `${this.preAggregation.preAggregationsSchema}.${t.table_name || t.TABLE_NAME}`)
+        .filter(t => toSave.indexOf(t) === -1);
+
+      await Promise.all(toDrop.map(table => saveCancelFn(client.dropTable(table))));
+      this.logger('Dropping orphaned tables completed', {
+        ...queryOptions,
+        external,
+        tablesToDrop: JSON.stringify(toDrop),
+      });
+    });
+  }
+
+  private dropLockKey(external: boolean) {
+    return external
+      ? 'drop-orphaned-tables-external'
+      : `drop-orphaned-tables:${this.preAggregation.dataSource}`;
+  }
+}
diff --git a/packages/cubejs-query-orchestrator/src/orchestrator/PreAggregationPartitionRangeLoader.ts b/packages/cubejs-query-orchestrator/src/orchestrator/PreAggregationPartitionRangeLoader.ts
new file mode 100644
index 0000000000..23af066803
--- /dev/null
+++ b/packages/cubejs-query-orchestrator/src/orchestrator/PreAggregationPartitionRangeLoader.ts
@@ -0,0 +1,504 @@
+import {
+  addSecondsToLocalTimestamp,
+  BUILD_RANGE_END_LOCAL,
+  BUILD_RANGE_START_LOCAL,
+  FROM_PARTITION_RANGE,
+  TO_PARTITION_RANGE,
+  MAX_SOURCE_ROW_LIMIT,
+  reformatInIsoLocal,
+  utcToLocalTimeZone,
+  timeSeries,
+  inDbTimeZone,
+  extractDate
+} from '@cubejs-backend/shared';
+import { InlineTable, TableStructure } from '@cubejs-backend/base-driver';
+import { DriverFactory } from './DriverFactory';
+import { QueryCache, QueryTuple, QueryWithParams } from './QueryCache';
+import {
+  getLastUpdatedAtTimestamp,
+  LAMBDA_TABLE_PREFIX,
+  LambdaQuery,
+  LoadPreAggregationResult,
+  PartitionRanges,
+  PreAggregationDescription,
+  PreAggregations,
+  QueryDateRange
+} from './PreAggregations';
+import { PreAggregationLoader } from './PreAggregationLoader';
+import { PreAggregationLoadCache } from './PreAggregationLoadCache';
+
+interface PreAggsPartitionRangeLoaderOpts {
+  maxPartitions: number;
+  maxSourceRowLimit: number;
+  waitForRenew?: boolean;
+  requestId?: string;
+  externalRefresh?: boolean;
+  forceBuild?: boolean;
+  metadata?: any;
+  orphanedTimeout?: number;
+  lambdaQuery?: LambdaQuery;
+  isJob?: boolean;
+  compilerCacheFn?: <T>(subKey: string[], cacheFn: () => T) => T;
+}
+
+export class PreAggregationPartitionRangeLoader {
+  /**
+   * Determines whether current instance instantiated for a jobbed build query
+   * (initialized by the /cubejs-system/v1/pre-aggregations/jobs endpoint) or
+   * not.
+   */
+  protected isJob: boolean;
+
+  protected waitForRenew: boolean;
+
+  protected requestId: string;
+
+  protected lambdaQuery: LambdaQuery;
+
+  protected dataSource: string;
+
+  protected compilerCacheFn: <T>(subKey: string[], cacheFn: () => T) => T;
+
+  public constructor(
+    private readonly driverFactory: DriverFactory,
+    private readonly logger: any,
+    private readonly queryCache: QueryCache,
+    // eslint-disable-next-line no-use-before-define
+    private readonly preAggregations: PreAggregations,
+    private readonly preAggregation: PreAggregationDescription,
+    private readonly preAggregationsTablesToTempTables: [string, LoadPreAggregationResult][],
+    private readonly loadCache: PreAggregationLoadCache,
+    private readonly options: PreAggsPartitionRangeLoaderOpts = {
+      maxPartitions: 10000,
+      maxSourceRowLimit: 10000,
+    },
+  ) {
+    this.isJob = !!options.isJob;
+    this.waitForRenew = options.waitForRenew;
+    this.requestId = options.requestId;
+    this.lambdaQuery = options.lambdaQuery;
+    this.dataSource = preAggregation.dataSource;
+    this.compilerCacheFn = options.compilerCacheFn || ((subKey, cacheFn) => cacheFn());
+  }
+
+  private async loadRangeQuery(rangeQuery: QueryTuple, partitionRange?: QueryDateRange) {
+    const [query, values, queryOptions]: QueryTuple = rangeQuery;
+    const invalidate =
+      this.preAggregation.invalidateKeyQueries &&
+      this.preAggregation.invalidateKeyQueries[0]
+        ? this.preAggregation.invalidateKeyQueries[0].slice(0, 2)
+        : false;
+
+    return this.queryCache.cacheQueryResult(
+      query,
+      <string[]>values,
+      QueryCache.queryCacheKey({
+        query,
+        values: (<string[]>values),
+        invalidate,
+      }),
+      24 * 60 * 60,
+      {
+        renewalThreshold: this.queryCache.options.refreshKeyRenewalThreshold
+          || queryOptions?.renewalThreshold || 24 * 60 * 60,
+        waitForRenew: this.waitForRenew,
+        priority: this.priority(10),
+        requestId: this.requestId,
+        dataSource: this.dataSource,
+        useInMemory: true,
+        external: queryOptions?.external,
+        renewalKey: partitionRange ? await this.getInvalidationKeyValues(partitionRange) : null,
+      }
+    );
+  }
+
+  protected getInvalidationKeyValues(range) {
+    const partitionTableName = PreAggregationPartitionRangeLoader.partitionTableName(
+      this.preAggregation.tableName, this.preAggregation.partitionGranularity, range
+    );
+    return Promise.all(
+      (this.preAggregation.invalidateKeyQueries || []).map(
+        (sqlQuery) => (
+          this.loadCache.keyQueryResult(
+            this.replacePartitionSqlAndParams(sqlQuery, range, partitionTableName), this.waitForRenew, this.priority(10)
+          )
+        )
+      )
+    );
+  }
+
+  protected priority(defaultValue) {
+    return this.preAggregation.priority != null ? this.preAggregation.priority : defaultValue;
+  }
+
+  public async replaceQueryBuildRangeParams(queryValues: string[]): Promise<string[] | null> {
+    if (queryValues?.find(p => p === BUILD_RANGE_START_LOCAL || p === BUILD_RANGE_END_LOCAL)) {
+      const [buildRangeStart, buildRangeEnd] = await this.loadBuildRange();
+      return queryValues?.map(
+        param => {
+          if (param === BUILD_RANGE_START_LOCAL) {
+            return utcToLocalTimeZone(this.preAggregation.timezone, this.preAggregation.timestampFormat, buildRangeStart);
+          } else if (param === BUILD_RANGE_END_LOCAL) {
+            return utcToLocalTimeZone(this.preAggregation.timezone, this.preAggregation.timestampFormat, buildRangeEnd);
+          } else {
+            return param;
+          }
+        },
+      );
+    }
+    return null;
+  }
+
+  private replacePartitionSqlAndParams(
+    query: QueryWithParams,
+    dateRange: QueryDateRange,
+    partitionTableName: string
+  ): QueryWithParams {
+    const [sql, params, options] = query;
+    const updateWindowToBoundary = options?.incremental && addSecondsToLocalTimestamp(
+      dateRange[1], this.preAggregation.timezone, options?.updateWindowSeconds || 0
+    );
+    return [sql.replace(this.preAggregation.tableName, partitionTableName), params?.map(
+      param => {
+        if (dateRange && param === FROM_PARTITION_RANGE) {
+          return PreAggregationPartitionRangeLoader.inDbTimeZone(this.preAggregation, dateRange[0]);
+        } else if (dateRange && param === TO_PARTITION_RANGE) {
+          return PreAggregationPartitionRangeLoader.inDbTimeZone(this.preAggregation, dateRange[1]);
+        } else {
+          return param;
+        }
+      },
+    ), {
+      ...options,
+      renewalThreshold:
+        options?.incremental && updateWindowToBoundary < new Date() ?
+          // if updateWindowToBoundary passed just moments ago we want to renew it earlier in case
+          // of server and db clock don't match
+          Math.min(
+            Math.round((new Date().getTime() - updateWindowToBoundary.getTime()) / 1000),
+            options?.renewalThresholdOutsideUpdateWindow
+          ) :
+          options?.renewalThreshold
+    }];
+  }
+
+  private partitionPreAggregationDescription(range: QueryDateRange, buildRange: QueryDateRange): PreAggregationDescription {
+    const partitionTableName = PreAggregationPartitionRangeLoader.partitionTableName(
+      this.preAggregation.tableName, this.preAggregation.partitionGranularity, range
+    );
+    const [_, buildRangeEnd] = buildRange;
+    const loadRange: [string, string] = [...range];
+    const partitionInvalidateKeyQueries = this.preAggregation.partitionInvalidateKeyQueries || this.preAggregation.invalidateKeyQueries;
+    // `partitionInvalidateKeyQueries = []` in case of real time
+    if ((!partitionInvalidateKeyQueries || partitionInvalidateKeyQueries.length > 0) && buildRangeEnd < range[1]) {
+      loadRange[1] = buildRangeEnd;
+    }
+    const sealAt = addSecondsToLocalTimestamp(
+      loadRange[1], this.preAggregation.timezone, this.preAggregation.updateWindowSeconds || 0
+    ).toISOString();
+    return {
+      ...this.preAggregation,
+      tableName: partitionTableName,
+      structureVersionLoadSql: this.preAggregation.loadSql &&
+        this.replacePartitionSqlAndParams(this.preAggregation.loadSql, range, partitionTableName),
+      loadSql: this.preAggregation.loadSql &&
+        this.replacePartitionSqlAndParams(this.preAggregation.loadSql, loadRange, partitionTableName),
+      sql: this.preAggregation.sql &&
+        this.replacePartitionSqlAndParams(this.preAggregation.sql, loadRange, partitionTableName),
+      invalidateKeyQueries: (this.preAggregation.invalidateKeyQueries || [])
+        .map(q => this.replacePartitionSqlAndParams(q, range, partitionTableName)),
+      partitionInvalidateKeyQueries: this.preAggregation.partitionInvalidateKeyQueries &&
+        this.preAggregation.partitionInvalidateKeyQueries.map(q => this.replacePartitionSqlAndParams(q, range, partitionTableName)),
+      indexesSql: (this.preAggregation.indexesSql || [])
+        .map(q => ({ ...q, sql: this.replacePartitionSqlAndParams(q.sql, range, partitionTableName) })),
+      previewSql: this.preAggregation.previewSql &&
+        this.replacePartitionSqlAndParams(this.preAggregation.previewSql, range, partitionTableName),
+      buildRangeStart: loadRange[0],
+      buildRangeEnd: loadRange[1],
+      sealAt, // Used only for kSql pre aggregations
+    };
+  }
+
+  public async loadPreAggregations(): Promise<LoadPreAggregationResult> {
+    if (this.preAggregation.partitionGranularity && !this.preAggregation.expandedPartition) {
+      const loadPreAggregationsByPartitionRanges = async ({ buildRange, partitionRanges }: PartitionRanges) => {
+        const partitionLoaders = partitionRanges.map(range => new PreAggregationLoader(
+          this.driverFactory,
+          this.logger,
+          this.queryCache,
+          this.preAggregations,
+          this.partitionPreAggregationDescription(range, buildRange),
+          this.preAggregationsTablesToTempTables,
+          this.loadCache,
+          this.options,
+        ));
+        const resolveResults = await Promise.all(partitionLoaders.map(async (l, i) => {
+          const result = await l.loadPreAggregation(false);
+          return result && {
+            ...result,
+            partitionRange: partitionRanges[i]
+          };
+        }));
+        return { loadResults: resolveResults.filter(res => res !== null), partitionLoaders };
+      };
+
+      // eslint-disable-next-line prefer-const
+      let loadResultAndLoaders = await loadPreAggregationsByPartitionRanges(await this.partitionRanges());
+      if (this.options.externalRefresh && loadResultAndLoaders.loadResults.length === 0) {
+        loadResultAndLoaders = await loadPreAggregationsByPartitionRanges(await this.partitionRanges(true));
+        // In case there're no partitions ready at matched time dimension intersection then no data can be retrieved.
+        // We need to provide any table so query can just execute successfully.
+        if (loadResultAndLoaders.loadResults.length > 0) {
+          loadResultAndLoaders.loadResults = [loadResultAndLoaders.loadResults[loadResultAndLoaders.loadResults.length - 1]];
+        }
+      }
+      if (this.options.externalRefresh && loadResultAndLoaders.loadResults.length === 0) {
+        throw new Error(
+          // eslint-disable-next-line no-use-before-define
+          PreAggregations.noPreAggregationPartitionsBuiltMessage(loadResultAndLoaders.partitionLoaders.map(p => p.preAggregation))
+        );
+      }
+
+      let { loadResults } = loadResultAndLoaders;
+
+      let lambdaTable: InlineTable;
+      let emptyResult = false;
+
+      if (this.preAggregation.rollupLambdaId) {
+        if (this.lambdaQuery && loadResults.length > 0) {
+          const { buildRangeEnd, targetTableName } = loadResults[loadResults.length - 1];
+          const lambdaTypes = await this.loadCache.getTableColumnTypes(this.preAggregation, targetTableName);
+          lambdaTable = await this.downloadLambdaTable(buildRangeEnd, lambdaTypes);
+        }
+        const rollupLambdaResults = this.preAggregationsTablesToTempTables.filter(tempTableResult => tempTableResult[1].rollupLambdaId === this.preAggregation.rollupLambdaId);
+        const filteredResults = loadResults.filter(
+          r => (this.preAggregation.lastRollupLambda || reformatInIsoLocal(r.buildRangeEnd) === reformatInIsoLocal(r.partitionRange[1])) &&
+            rollupLambdaResults.every(result => !result[1].buildRangeEnd || reformatInIsoLocal(result[1].buildRangeEnd) < reformatInIsoLocal(r.partitionRange[0]))
+        );
+        if (filteredResults.length === 0) {
+          emptyResult = true;
+          loadResults = [loadResults[loadResults.length - 1]];
+        } else {
+          loadResults = filteredResults;
+        }
+      }
+
+      const allTableTargetNames = loadResults.map(targetTableName => targetTableName.targetTableName);
+      let lastUpdatedAt = getLastUpdatedAtTimestamp(loadResults.map(r => r.lastUpdatedAt));
+
+      if (lambdaTable) {
+        allTableTargetNames.push(lambdaTable.name);
+        lastUpdatedAt = Date.now();
+      }
+
+      const unionTargetTableName = allTableTargetNames
+        .map(targetTableName => `SELECT * FROM ${targetTableName}${emptyResult ? ' WHERE 1 = 0' : ''}`)
+        .join(' UNION ALL ');
+      return {
+        targetTableName: allTableTargetNames.length === 1 && !emptyResult ? allTableTargetNames[0] : `(${unionTargetTableName})`,
+        refreshKeyValues: loadResults.map(t => t.refreshKeyValues),
+        lastUpdatedAt,
+        buildRangeEnd: !emptyResult && loadResults.length && loadResults[loadResults.length - 1].buildRangeEnd,
+        lambdaTable,
+        rollupLambdaId: this.preAggregation.rollupLambdaId,
+      };
+    } else {
+      return new PreAggregationLoader(
+        this.driverFactory,
+        this.logger,
+        this.queryCache,
+        this.preAggregations,
+        this.preAggregation,
+        this.preAggregationsTablesToTempTables,
+        this.loadCache,
+        this.options
+      ).loadPreAggregation(true);
+    }
+  }
+
+  /**
+   * Downloads the lambda table from the source DB.
+   */
+  private async downloadLambdaTable(fromDate: string, lambdaTypes: TableStructure): Promise<InlineTable> {
+    const { sqlAndParams, cacheKeyQueries } = this.lambdaQuery;
+    const [query, params] = sqlAndParams;
+    const values = params.map((p) => {
+      if (p === FROM_PARTITION_RANGE) {
+        return fromDate;
+      }
+      if (p === MAX_SOURCE_ROW_LIMIT) {
+        return this.options.maxSourceRowLimit;
+      }
+      return p;
+    });
+    const { data } = await this.queryCache.renewQuery(
+      query,
+      <string[]>values,
+      cacheKeyQueries,
+      60 * 60,
+      [query, <string[]>values],
+      undefined,
+      {
+        requestId: this.requestId,
+        skipRefreshKeyWaitForRenew: false,
+        dataSource: this.dataSource,
+        external: false,
+        useCsvQuery: true,
+        lambdaTypes,
+      }
+    );
+    if (data.rowCount === this.options.maxSourceRowLimit) {
+      throw new Error(`The maximum number of source rows ${this.options.maxSourceRowLimit} was reached for ${this.preAggregation.preAggregationId}`);
+    }
+    return {
+      name: `${LAMBDA_TABLE_PREFIX}_${this.preAggregation.tableName.replace('.', '_')}`,
+      columns: data.types,
+      csvRows: data.csvRows,
+    };
+  }
+
+  public async partitionPreAggregations(): Promise<PreAggregationDescription[]> {
+    if (this.preAggregation.partitionGranularity && !this.preAggregation.expandedPartition) {
+      const { buildRange, partitionRanges } = await this.partitionRanges();
+      return this.compilerCacheFn(['partitions', JSON.stringify(buildRange)], () => partitionRanges.map(range => this.partitionPreAggregationDescription(range, buildRange)));
+    } else {
+      return [this.preAggregation];
+    }
+  }
+
+  private async partitionRanges(ignoreMatchedDateRange?: boolean): Promise<PartitionRanges> {
+    const buildRange = await this.loadBuildRange();
+    if (!buildRange[0] || !buildRange[1]) {
+      return { buildRange, partitionRanges: [] };
+    }
+    let dateRange = PreAggregationPartitionRangeLoader.intersectDateRanges(
+      buildRange,
+      ignoreMatchedDateRange ? undefined : this.preAggregation.matchedTimeDimensionDateRange,
+    );
+    if (!dateRange) {
+      // If there's no date range intersection between query data range and pre-aggregation build range
+      // use last partition so outer query can receive expected table structure.
+      dateRange = [buildRange[1], buildRange[1]];
+    }
+    const partitionRanges = this.compilerCacheFn(['timeSeries', this.preAggregation.partitionGranularity, JSON.stringify(dateRange), `${this.preAggregation.timestampPrecision}`], () => PreAggregationPartitionRangeLoader.timeSeries(
+      this.preAggregation.partitionGranularity,
+      dateRange,
+      this.preAggregation.timestampPrecision
+    ));
+    if (partitionRanges.length > this.options.maxPartitions) {
+      throw new Error(
+        `Pre-aggregation '${this.preAggregation.tableName}' requested to build ${partitionRanges.length} partitions which exceeds the maximum number of partitions per pre-aggregation of ${this.options.maxPartitions}`
+      );
+    }
+    return { buildRange: dateRange, partitionRanges };
+  }
+
+  public async loadBuildRange(): Promise<QueryDateRange> {
+    const { preAggregationStartEndQueries } = this.preAggregation;
+    const [startDate, endDate] = await Promise.all(
+      preAggregationStartEndQueries.map(
+        async rangeQuery => PreAggregationPartitionRangeLoader.extractDate(await this.loadRangeQuery(rangeQuery)),
+      ),
+    );
+    if (!this.preAggregation.partitionGranularity) {
+      return this.orNowIfEmpty([startDate, endDate]);
+    }
+    const wholeSeriesRanges = PreAggregationPartitionRangeLoader.timeSeries(
+      this.preAggregation.partitionGranularity,
+      this.orNowIfEmpty([startDate, endDate]),
+      this.preAggregation.timestampPrecision,
+    );
+    const [rangeStart, rangeEnd] = await Promise.all(
+      preAggregationStartEndQueries.map(
+        async (rangeQuery, i) => PreAggregationPartitionRangeLoader.extractDate(
+          await this.loadRangeQuery(
+            rangeQuery, i === 0 ? wholeSeriesRanges[0] : wholeSeriesRanges[wholeSeriesRanges.length - 1],
+          ),
+        ),
+      ),
+    );
+    return this.orNowIfEmpty([rangeStart, rangeEnd]);
+  }
+
+  private now() {
+    return utcToLocalTimeZone(this.preAggregation.timezone, 'YYYY-MM-DDTHH:mm:ss.SSS', new Date().toJSON().substring(0, 23));
+  }
+
+  private orNowIfEmpty(dateRange: QueryDateRange): QueryDateRange {
+    if (!dateRange[0] && !dateRange[1]) {
+      const now = this.now();
+      return [now, now];
+    }
+    if (!dateRange[0]) {
+      return [dateRange[1], dateRange[1]];
+    }
+    if (!dateRange[1]) {
+      return [dateRange[0], dateRange[0]];
+    }
+    return dateRange;
+  }
+
+  private static checkDataRangeType(range: QueryDateRange) {
+    if (!range) {
+      return;
+    }
+
+    if (range.length !== 2) {
+      throw new Error(`Date range expected to be an array with 2 elements but ${range} found`);
+    }
+
+    if (typeof range[0] !== 'string' || typeof range[1] !== 'string') {
+      throw new Error(`Date range expected to be a string array but ${range} found`);
+    }
+
+    if ((range[0].length !== 23 && range[0].length !== 26) || (range[1].length !== 23 && range[0].length !== 26)) {
+      throw new Error(`Date range expected to be in YYYY-MM-DDTHH:mm:ss.SSS format but ${range} found`);
+    }
+  }
+
+  public static intersectDateRanges(rangeA: QueryDateRange | null, rangeB: QueryDateRange | null): QueryDateRange {
+    PreAggregationPartitionRangeLoader.checkDataRangeType(rangeA);
+    PreAggregationPartitionRangeLoader.checkDataRangeType(rangeB);
+    if (!rangeB) {
+      return rangeA;
+    }
+    if (!rangeA) {
+      return rangeB;
+    }
+    const from = rangeA[0] > rangeB[0] ? rangeA[0] : rangeB[0];
+    const to = rangeA[1] < rangeB[1] ? rangeA[1] : rangeB[1];
+    if (from > to) {
+      return null;
+    }
+    return [
+      from,
+      to,
+    ];
+  }
+
+  public static timeSeries(granularity: string, dateRange: QueryDateRange, timestampPrecision: number): QueryDateRange[] {
+    return timeSeries(granularity, dateRange, {
+      timestampPrecision
+    });
+  }
+
+  public static partitionTableName(tableName: string, partitionGranularity: string, dateRange: string[]) {
+    const partitionSuffix = dateRange[0].substring(
+      0,
+      partitionGranularity === 'hour' ? 13 : 10
+    ).replace(/[-T:]/g, '');
+    return `${tableName}${partitionSuffix}`;
+  }
+
+  public static inDbTimeZone(preAggregationDescription: any, timestamp: string): string {
+    return inDbTimeZone(preAggregationDescription.timezone, preAggregationDescription.timestampFormat, timestamp);
+  }
+
+  public static extractDate(data: any): string {
+    return extractDate(data);
+  }
+
+  public static FROM_PARTITION_RANGE = FROM_PARTITION_RANGE;
+
+  public static TO_PARTITION_RANGE = TO_PARTITION_RANGE;
+}
diff --git a/packages/cubejs-query-orchestrator/src/orchestrator/PreAggregations.ts b/packages/cubejs-query-orchestrator/src/orchestrator/PreAggregations.ts
index 4c858c3b7d..3d3ecaa13f 100644
--- a/packages/cubejs-query-orchestrator/src/orchestrator/PreAggregations.ts
+++ b/packages/cubejs-query-orchestrator/src/orchestrator/PreAggregations.ts
@@ -1,42 +1,18 @@
-import crypto from 'crypto';
 import R from 'ramda';
-import {
-  addSecondsToLocalTimestamp,
-  BUILD_RANGE_END_LOCAL,
-  BUILD_RANGE_START_LOCAL,
-  extractDate,
-  FROM_PARTITION_RANGE,
-  getEnv,
-  inDbTimeZone,
-  MAX_SOURCE_ROW_LIMIT, MaybeCancelablePromise, reformatInIsoLocal,
-  timeSeries,
-  TO_PARTITION_RANGE,
-  utcToLocalTimeZone,
-} from '@cubejs-backend/shared';
-
-import {
-  BaseDriver,
-  cancelCombinator,
-  DownloadQueryResultsResult,
-  DownloadTableData,
-  DriverCapabilities,
-  DriverInterface,
-  InlineTable,
-  isDownloadTableCSVData,
-  SaveCancelFn,
-  StreamOptions,
-  TableStructure,
-  UnloadOptions,
-} from '@cubejs-backend/base-driver';
+import crypto from 'crypto';
+import { getEnv, } from '@cubejs-backend/shared';
+
+import { BaseDriver, InlineTable, } from '@cubejs-backend/base-driver';
 import { CubeStoreDriver } from '@cubejs-backend/cubestore-driver';
 import LRUCache from 'lru-cache';
 
 import { PreAggTableToTempTable, Query, QueryBody, QueryCache, QueryTuple, QueryWithParams } from './QueryCache';
-import { ContinueWaitError } from './ContinueWaitError';
 import { DriverFactory, DriverFactoryByDataSource } from './DriverFactory';
 import { QueryQueue } from './QueryQueue';
-import { LargeStreamWarning } from './StreamObjectsCounter';
 import { CacheAndQueryDriverType } from './QueryOrchestrator';
+import { PreAggregationPartitionRangeLoader } from './PreAggregationPartitionRangeLoader';
+import { PreAggregationLoader } from './PreAggregationLoader';
+import { PreAggregationLoadCache } from './PreAggregationLoadCache';
 
 /// Name of the inline table containing the lambda rows.
 export const LAMBDA_TABLE_PREFIX = 'lambda';
@@ -49,7 +25,7 @@ function decodeTimeStamp(time) {
   return parseInt(time, 32) * 1000;
 }
 
-function version(cacheKey) {
+export function version(cacheKey) {
   let result = '';
 
   const hashCharset = 'abcdefghijklmnopqrstuvwxyz012345';
@@ -77,12 +53,6 @@ function version(cacheKey) {
   return result;
 }
 
-// There’re community developed and custom drivers which not always up-to-date with latest BaseDriver.
-// Extra defence for drivers that don't expose now() yet.
-function nowTimestamp(client: DriverInterface) {
-  return client.nowTimestamp?.() ?? new Date().getTime();
-}
-
 // Returns the oldest timestamp, if any.
 export function getLastUpdatedAtTimestamp(
   timestamps: (number | undefined)[]
@@ -95,7 +65,7 @@ export function getLastUpdatedAtTimestamp(
   }
 }
 
-function getStructureVersion(preAggregation) {
+export function getStructureVersion(preAggregation) {
   const versionArray = [preAggregation.structureVersionLoadSql || preAggregation.loadSql];
   if (preAggregation.indexesSql && preAggregation.indexesSql.length) {
     versionArray.push(preAggregation.indexesSql);
@@ -110,7 +80,7 @@ function getStructureVersion(preAggregation) {
   return version(versionArray.length === 1 ? versionArray[0] : versionArray);
 }
 
-type VersionEntry = {
+export type VersionEntry = {
   'table_name': string,
   'content_version': string,
   'structure_version': string,
@@ -119,21 +89,16 @@ type VersionEntry = {
   'naming_version'?: number
 };
 
-type IndexesSql = { sql: [string, unknown[]], indexName: string }[];
-type InvalidationKeys = unknown[];
-
-type QueryKey = [QueryTuple, IndexesSql, InvalidationKeys] | [QueryTuple, InvalidationKeys];
-
-type QueryOptions = {
-  queryKey: QueryKey;
-  newVersionEntry: VersionEntry;
-  query: string;
-  values: unknown[];
-  requestId: string;
-  buildRangeEnd?: string;
+export type VersionEntriesObj = {
+  versionEntries: VersionEntry[],
+  byStructure: { [key: string]: VersionEntry },
+  byContent: { [key: string]: VersionEntry },
+  byTableName: { [key: string]: VersionEntry },
 };
 
-type TableCacheEntry = {
+export type InvalidationKeys = unknown[];
+
+export type TableCacheEntry = {
   // eslint-disable-next-line camelcase
   table_name?: string;
   TABLE_NAME?: string;
@@ -141,9 +106,9 @@ type TableCacheEntry = {
   build_range_end?: string;
 };
 
-type QueryDateRange = [string, string];
+export type QueryDateRange = [string, string];
 
-type PartitionRanges = {
+export type PartitionRanges = {
   buildRange: QueryDateRange,
   partitionRanges: QueryDateRange[],
 };
@@ -168,6 +133,17 @@ type PreAggJob = {
   dataSource: string,
 };
 
+export type LoadPreAggregationResult = {
+  targetTableName: string;
+  refreshKeyValues: any[];
+  lastUpdatedAt: number;
+  buildRangeEnd: string;
+  lambdaTable?: InlineTable;
+  queryKey?: any[];
+  rollupLambdaId?: string;
+  partitionRange?: QueryDateRange;
+};
+
 export type LambdaOptions = {
   maxSourceRows: number
 };
@@ -209,7 +185,7 @@ export type PreAggregationDescription = {
   lastRollupLambda?: boolean;
 };
 
-const tablesToVersionEntries = (schema, tables: TableCacheEntry[]): VersionEntry[] => R.sortBy(
+export const tablesToVersionEntries = (schema, tables: TableCacheEntry[]): VersionEntry[] => R.sortBy(
   table => -table.last_updated_at,
   tables.map(table => {
     const match = (table.table_name || table.TABLE_NAME).match(/(.+)_(.+)_(.+)_(.+)/);
@@ -239,1735 +215,6 @@ const tablesToVersionEntries = (schema, tables: TableCacheEntry[]): VersionEntry
   }).filter(R.identity)
 );
 
-type PreAggregationLoadCacheOptions = {
-  requestId?: string,
-  dataSource: string,
-  tablePrefixes?: string[],
-};
-
-type VersionEntriesObj = {
-  versionEntries: VersionEntry[],
-  byStructure: { [key: string]: VersionEntry },
-  byContent: { [key: string]: VersionEntry },
-  byTableName: { [key: string]: VersionEntry },
-};
-
-class PreAggregationLoadCache {
-  private redisPrefix: string;
-
-  private driverFactory: DriverFactory;
-
-  private queryCache: QueryCache;
-
-  // eslint-disable-next-line no-use-before-define
-  private preAggregations: PreAggregations;
-
-  private queryResults: any;
-
-  private externalDriverFactory: any;
-
-  private requestId: any;
-
-  private versionEntries: { [redisKey: string]: Promise<VersionEntriesObj> };
-
-  private tables: { [redisKey: string]: TableCacheEntry[] };
-
-  private tableColumnTypes: { [cacheKey: string]: { [tableName: string]: TableStructure } };
-
-  // TODO this is in memory cache structure as well however it depends on
-  // data source only and load cache is per data source for now.
-  // Make it per data source key in case load cache scope is broaden.
-  private queryStageState: any;
-
-  private dataSource: string;
-
-  private tablePrefixes: string[] | null;
-
-  public constructor(
-    redisPrefix,
-    clientFactory: DriverFactory,
-    queryCache,
-    preAggregations,
-    options: PreAggregationLoadCacheOptions = { dataSource: 'default' }
-  ) {
-    this.redisPrefix = `${redisPrefix}_${options.dataSource}`;
-    this.dataSource = options.dataSource;
-    this.driverFactory = clientFactory;
-    this.queryCache = queryCache;
-    this.preAggregations = preAggregations;
-    this.queryResults = {};
-    this.externalDriverFactory = preAggregations.externalDriverFactory;
-    this.requestId = options.requestId;
-    this.tablePrefixes = options.tablePrefixes;
-    this.versionEntries = {};
-    this.tables = {};
-    this.tableColumnTypes = {};
-  }
-
-  protected async tablesFromCache(preAggregation, forceRenew?) {
-    let tables = forceRenew ? null : await this.queryCache.getCacheDriver().get(this.tablesCachePrefixKey(preAggregation));
-    if (!tables) {
-      tables = await this.preAggregations.getLoadCacheQueue(this.dataSource).executeInQueue(
-        'query',
-        `Fetch tables for ${preAggregation.preAggregationsSchema}`,
-        {
-          preAggregation, requestId: this.requestId
-        },
-        0,
-        { requestId: this.requestId }
-      );
-    }
-    return tables;
-  }
-
-  public async fetchTables(preAggregation: PreAggregationDescription) {
-    if (preAggregation.external && !this.externalDriverFactory) {
-      throw new Error('externalDriverFactory is not provided. Please use CUBEJS_DEV_MODE=true or provide Cube Store connection env variables for production usage.');
-    }
-
-    const newTables = await this.fetchTablesNoCache(preAggregation);
-    await this.queryCache.getCacheDriver().set(
-      this.tablesCachePrefixKey(preAggregation),
-      newTables,
-      this.preAggregations.options.preAggregationsSchemaCacheExpire || 60 * 60
-    );
-    return newTables;
-  }
-
-  private async fetchTablesNoCache(preAggregation: PreAggregationDescription) {
-    const client = preAggregation.external ?
-      await this.externalDriverFactory() :
-      await this.driverFactory();
-    if (this.tablePrefixes && client.getPrefixTablesQuery && this.preAggregations.options.skipExternalCacheAndQueue) {
-      return client.getPrefixTablesQuery(preAggregation.preAggregationsSchema, this.tablePrefixes);
-    }
-    return client.getTablesQuery(preAggregation.preAggregationsSchema);
-  }
-
-  public tablesCachePrefixKey(preAggregation: PreAggregationDescription) {
-    return this.queryCache.getKey('SQL_PRE_AGGREGATIONS_TABLES', `${preAggregation.dataSource}${preAggregation.preAggregationsSchema}${preAggregation.external ? '_EXT' : ''}`);
-  }
-
-  protected async getTablesQuery(preAggregation) {
-    const redisKey = this.tablesCachePrefixKey(preAggregation);
-    if (!this.tables[redisKey]) {
-      const tables = this.preAggregations.options.skipExternalCacheAndQueue && preAggregation.external ?
-        await this.fetchTablesNoCache(preAggregation) :
-        await this.tablesFromCache(preAggregation);
-      if (tables === undefined) {
-        throw new Error('Pre-aggregation tables are undefined.');
-      }
-      this.tables[redisKey] = tables;
-    }
-    return this.tables[redisKey];
-  }
-
-  public async getTableColumnTypes(preAggregation: PreAggregationDescription, tableName: string): Promise<TableStructure> {
-    const prefixKey = this.tablesCachePrefixKey(preAggregation);
-    if (!this.tableColumnTypes[prefixKey]?.[tableName]) {
-      if (!this.preAggregations.options.skipExternalCacheAndQueue && preAggregation.external) {
-        throw new Error(`Lambda union with source data feature is supported only by external rollups stored in Cube Store but was invoked for '${preAggregation.preAggregationId}'`);
-      }
-      const client = await this.externalDriverFactory();
-      const columnTypes = await client.tableColumnTypes(tableName);
-      if (!this.tableColumnTypes[prefixKey]) {
-        this.tableColumnTypes[prefixKey] = {};
-      }
-      this.tableColumnTypes[prefixKey][tableName] = columnTypes;
-    }
-    return this.tableColumnTypes[prefixKey][tableName];
-  }
-
-  private async calculateVersionEntries(preAggregation): Promise<VersionEntriesObj> {
-    let versionEntries = tablesToVersionEntries(
-      preAggregation.preAggregationsSchema,
-      await this.getTablesQuery(preAggregation)
-    );
-    // It presumes strong consistency guarantees for external pre-aggregation tables ingestion
-    if (!preAggregation.external) {
-      // eslint-disable-next-line
-      const [active, toProcess, queries] = await this.fetchQueryStageState();
-      const targetTableNamesInQueue = (Object.keys(queries))
-        // eslint-disable-next-line no-use-before-define
-        .map(q => PreAggregations.targetTableName(queries[q].query.newVersionEntry));
-
-      versionEntries = versionEntries.filter(
-        // eslint-disable-next-line no-use-before-define
-        e => targetTableNamesInQueue.indexOf(PreAggregations.targetTableName(e)) === -1
-      );
-    }
-
-    const byContent: { [key: string]: VersionEntry } = {};
-    const byStructure: { [key: string]: VersionEntry } = {};
-    const byTableName: { [key: string]: VersionEntry } = {};
-
-    versionEntries.forEach(e => {
-      const contentKey = `${e.table_name}_${e.content_version}`;
-      if (!byContent[contentKey]) {
-        byContent[contentKey] = e;
-      }
-      const structureKey = `${e.table_name}_${e.structure_version}`;
-      if (!byStructure[structureKey]) {
-        byStructure[structureKey] = e;
-      }
-      if (!byTableName[e.table_name]) {
-        byTableName[e.table_name] = e;
-      }
-    });
-
-    return { versionEntries, byContent, byStructure, byTableName };
-  }
-
-  public async getVersionEntries(preAggregation): Promise<VersionEntriesObj> {
-    if (this.tablePrefixes && !this.tablePrefixes.find(p => preAggregation.tableName.split('.')[1].startsWith(p))) {
-      throw new Error(`Load cache tries to load table ${preAggregation.tableName} outside of tablePrefixes filter: ${this.tablePrefixes.join(', ')}`);
-    }
-    const redisKey = this.tablesCachePrefixKey(preAggregation);
-    if (!this.versionEntries[redisKey]) {
-      this.versionEntries[redisKey] = this.calculateVersionEntries(preAggregation).catch(e => {
-        delete this.versionEntries[redisKey];
-        throw e;
-      });
-    }
-    return this.versionEntries[redisKey];
-  }
-
-  public async keyQueryResult(sqlQuery: QueryWithParams, waitForRenew: boolean, priority: number) {
-    const [query, values, queryOptions]: QueryTuple = Array.isArray(sqlQuery) ? sqlQuery : [sqlQuery, [], {}];
-
-    if (!this.queryResults[this.queryCache.queryRedisKey([query, values])]) {
-      this.queryResults[this.queryCache.queryRedisKey([query, values])] = await this.queryCache.cacheQueryResult(
-        query,
-        <string[]>values,
-        [query, <string[]>values],
-        60 * 60,
-        {
-          renewalThreshold: this.queryCache.options.refreshKeyRenewalThreshold
-            || queryOptions?.renewalThreshold || 2 * 60,
-          renewalKey: [query, values],
-          waitForRenew,
-          priority,
-          requestId: this.requestId,
-          dataSource: this.dataSource,
-          useInMemory: true,
-          external: queryOptions?.external
-        }
-      );
-    }
-    return this.queryResults[this.queryCache.queryRedisKey([query, values])];
-  }
-
-  public hasKeyQueryResult(keyQuery) {
-    return !!this.queryResults[this.queryCache.queryRedisKey(keyQuery)];
-  }
-
-  public async getQueryStage(stageQueryKey) {
-    const queue = await this.preAggregations.getQueue(this.dataSource);
-    await this.fetchQueryStageState(queue);
-    return queue.getQueryStage(stageQueryKey, undefined, this.queryStageState);
-  }
-
-  protected async fetchQueryStageState(queue?) {
-    queue = queue || await this.preAggregations.getQueue(this.dataSource);
-    if (!this.queryStageState) {
-      this.queryStageState = await queue.fetchQueryStageState();
-    }
-    return this.queryStageState;
-  }
-
-  public async reset(preAggregation) {
-    await this.tablesFromCache(preAggregation, true);
-    this.tables = {};
-    this.tableColumnTypes = {};
-    this.queryStageState = undefined;
-    this.versionEntries = {};
-  }
-}
-
-type LoadPreAggregationResult = {
-  targetTableName: string;
-  refreshKeyValues: any[];
-  lastUpdatedAt: number;
-  buildRangeEnd: string;
-  lambdaTable?: InlineTable;
-  queryKey?: any[];
-  rollupLambdaId?: string;
-  partitionRange?: QueryDateRange;
-};
-
-export class PreAggregationLoader {
-  // eslint-disable-next-line no-use-before-define
-  private preAggregations: PreAggregations;
-
-  public preAggregation: any;
-
-  private preAggregationsTablesToTempTables: any;
-
-  /**
-   * Determines whether current instance instantiated for a jobed build query
-   * (initialized by the /cubejs-system/v1/pre-aggregations/jobs endpoint) or
-   * not.
-   */
-  private isJob: boolean;
-
-  private waitForRenew: boolean;
-
-  private forceBuild: boolean;
-
-  private orphanedTimeout: number;
-
-  private externalDriverFactory: DriverFactory;
-
-  private requestId: string;
-
-  private metadata: any;
-
-  private structureVersionPersistTime: any;
-
-  private externalRefresh: boolean;
-
-  public constructor(
-    private readonly redisPrefix: string,
-    private readonly driverFactory: DriverFactory,
-    private readonly logger: any,
-    private readonly queryCache: QueryCache,
-    // eslint-disable-next-line no-use-before-define
-    preAggregations: PreAggregations,
-    preAggregation,
-    preAggregationsTablesToTempTables,
-    private readonly loadCache: PreAggregationLoadCache,
-    options: any = {}
-  ) {
-    this.preAggregations = preAggregations;
-    this.preAggregation = preAggregation;
-    this.preAggregationsTablesToTempTables = preAggregationsTablesToTempTables;
-    this.isJob = !!options.isJob;
-    this.waitForRenew = options.waitForRenew;
-    this.forceBuild = options.forceBuild;
-    this.orphanedTimeout = options.orphanedTimeout;
-    this.externalDriverFactory = preAggregations.externalDriverFactory;
-    this.requestId = options.requestId;
-    this.metadata = options.metadata;
-    this.structureVersionPersistTime = preAggregations.structureVersionPersistTime;
-    this.externalRefresh = options.externalRefresh;
-
-    if (this.externalRefresh && this.waitForRenew) {
-      const message = 'Invalid configuration - when externalRefresh is true, it will not perform a renew, therefore you cannot wait for it using waitForRenew.';
-      if (['production', 'test'].includes(getEnv('nodeEnv'))) {
-        throw new Error(message);
-      } else {
-        this.logger('Invalid Configuration', {
-          requestId: this.requestId,
-          warning: message,
-        });
-        this.waitForRenew = false;
-      }
-    }
-  }
-
-  public async loadPreAggregation(
-    throwOnMissingPartition: boolean,
-  ): Promise<null | LoadPreAggregationResult> {
-    const notLoadedKey = (this.preAggregation.invalidateKeyQueries || [])
-      .find(keyQuery => !this.loadCache.hasKeyQueryResult(keyQuery));
-
-    if (this.isJob || !(notLoadedKey && !this.waitForRenew)) {
-      // Case 1: pre-agg build job processing.
-      // Case 2: either we have no data cached for this rollup or waitForRenew
-      // is true, either way, synchronously renew what data is needed so that
-      // the most current data will be returned fo the current request.
-      const result = await this.loadPreAggregationWithKeys();
-      const refreshKeyValues = await this.getInvalidationKeyValues();
-      return {
-        ...result,
-        refreshKeyValues,
-        queryKey: this.isJob
-          // We need to return a queryKey value for the jobed build query
-          // (initialized by the /cubejs-system/v1/pre-aggregations/jobs
-          // endpoint) as a part of the response to make it possible to get a
-          // query result from the cache by the other API call.
-          ? this.preAggregationQueryKey(refreshKeyValues)
-          : undefined,
-      };
-    } else {
-      // Case 3: pre-agg is exists
-      const structureVersion = getStructureVersion(this.preAggregation);
-      const getVersionsStarted = new Date();
-      const { byStructure } = await this.loadCache.getVersionEntries(this.preAggregation);
-      this.logger('Load PreAggregations Tables', {
-        preAggregation: this.preAggregation,
-        requestId: this.requestId,
-        duration: (new Date().getTime() - getVersionsStarted.getTime())
-      });
-
-      const versionEntryByStructureVersion = byStructure[`${this.preAggregation.tableName}_${structureVersion}`];
-      if (this.externalRefresh) {
-        if (!versionEntryByStructureVersion && throwOnMissingPartition) {
-          // eslint-disable-next-line no-use-before-define
-          throw new Error(PreAggregations.noPreAggregationPartitionsBuiltMessage([this.preAggregation]));
-        }
-        if (!versionEntryByStructureVersion) {
-          return null;
-        } else {
-          // the rollups are being maintained independently of this instance of cube.js
-          // immediately return the latest rollup data that instance already has
-          return {
-            targetTableName: this.targetTableName(versionEntryByStructureVersion),
-            refreshKeyValues: [],
-            lastUpdatedAt: versionEntryByStructureVersion.last_updated_at,
-            buildRangeEnd: versionEntryByStructureVersion.build_range_end,
-          };
-        }
-      }
-
-      if (versionEntryByStructureVersion) {
-        // this triggers an asyncronous/background load of the pre-aggregation but immediately
-        // returns the latest data it already has
-        this.loadPreAggregationWithKeys().catch(e => {
-          if (!(e instanceof ContinueWaitError)) {
-            this.logger('Error loading pre-aggregation', {
-              error: (e.stack || e),
-              preAggregation: this.preAggregation,
-              requestId: this.requestId
-            });
-          }
-        });
-        return {
-          targetTableName: this.targetTableName(versionEntryByStructureVersion),
-          refreshKeyValues: [],
-          lastUpdatedAt: versionEntryByStructureVersion.last_updated_at,
-          buildRangeEnd: versionEntryByStructureVersion.build_range_end,
-        };
-      } else {
-        // no rollup has been built yet - build it synchronously as part of responding to this request
-        return this.loadPreAggregationWithKeys();
-      }
-    }
-  }
-
-  protected async loadPreAggregationWithKeys(): Promise<LoadPreAggregationResult> {
-    const invalidationKeys = await this.getPartitionInvalidationKeyValues();
-
-    const contentVersion = this.contentVersion(invalidationKeys);
-    const structureVersion = getStructureVersion(this.preAggregation);
-
-    const versionEntries = await this.loadCache.getVersionEntries(this.preAggregation);
-
-    const getVersionEntryByContentVersion = ({ byContent }: VersionEntriesObj) => byContent[`${this.preAggregation.tableName}_${contentVersion}`];
-
-    const versionEntryByContentVersion = getVersionEntryByContentVersion(versionEntries);
-    if (versionEntryByContentVersion && !this.forceBuild) {
-      const targetTableName = this.targetTableName(versionEntryByContentVersion);
-      // No need to block here
-      this.updateLastTouch(targetTableName);
-      return {
-        targetTableName,
-        refreshKeyValues: [],
-        lastUpdatedAt: versionEntryByContentVersion.last_updated_at,
-        buildRangeEnd: versionEntryByContentVersion.build_range_end,
-      };
-    }
-
-    if (!this.waitForRenew && !this.forceBuild) {
-      const versionEntryByStructureVersion = versionEntries.byStructure[`${this.preAggregation.tableName}_${structureVersion}`];
-      if (versionEntryByStructureVersion) {
-        const targetTableName = this.targetTableName(versionEntryByStructureVersion);
-        // No need to block here
-        this.updateLastTouch(targetTableName);
-        return {
-          targetTableName,
-          refreshKeyValues: [],
-          lastUpdatedAt: versionEntryByStructureVersion.last_updated_at,
-          buildRangeEnd: versionEntryByStructureVersion.build_range_end,
-        };
-      }
-    }
-
-    const client = this.preAggregation.external ?
-      await this.externalDriverFactory() :
-      await this.driverFactory();
-
-    if (!versionEntries.versionEntries.length) {
-      await client.createSchemaIfNotExists(this.preAggregation.preAggregationsSchema);
-    }
-
-    // ensure we find appropriate structure version before invalidating anything
-    const versionEntry =
-      versionEntries.byStructure[`${this.preAggregation.tableName}_${structureVersion}`] ||
-      versionEntries.byTableName[this.preAggregation.tableName];
-
-    const newVersionEntry = {
-      table_name: this.preAggregation.tableName,
-      structure_version: structureVersion,
-      content_version: contentVersion,
-      last_updated_at: nowTimestamp(client),
-      naming_version: 2,
-    };
-
-    const mostRecentResult: () => Promise<LoadPreAggregationResult> = async () => {
-      await this.loadCache.reset(this.preAggregation);
-      const lastVersion = getVersionEntryByContentVersion(
-        await this.loadCache.getVersionEntries(this.preAggregation)
-      );
-      if (!lastVersion) {
-        throw new Error(`Pre-aggregation table is not found for ${this.preAggregation.tableName} after it was successfully created`);
-      }
-      const targetTableName = this.targetTableName(lastVersion);
-      this.updateLastTouch(targetTableName);
-      return {
-        targetTableName,
-        refreshKeyValues: [],
-        lastUpdatedAt: lastVersion.last_updated_at,
-        buildRangeEnd: lastVersion.build_range_end,
-      };
-    };
-
-    if (this.forceBuild) {
-      this.logger('Force build pre-aggregation', {
-        preAggregation: this.preAggregation,
-        requestId: this.requestId,
-        metadata: this.metadata,
-        queryKey: this.preAggregationQueryKey(invalidationKeys),
-        newVersionEntry
-      });
-      if (this.isJob) {
-        // We don't want to wait for the jobed build query result. So we run the
-        // executeInQueue method and immediately return the LoadPreAggregationResult object.
-        this
-          .executeInQueue(invalidationKeys, this.priority(10), newVersionEntry)
-          .catch((e: any) => {
-            this.logger('Pre-aggregations build job error', {
-              preAggregation: this.preAggregation,
-              requestId: this.requestId,
-              newVersionEntry,
-              error: (e.stack || e),
-            });
-          });
-        const targetTableName = this.targetTableName(newVersionEntry);
-        this.updateLastTouch(targetTableName);
-        return {
-          targetTableName,
-          refreshKeyValues: [],
-          lastUpdatedAt: newVersionEntry.last_updated_at,
-          buildRangeEnd: this.preAggregation.buildRangeEnd,
-        };
-      } else {
-        await this.executeInQueue(invalidationKeys, this.priority(10), newVersionEntry);
-        return mostRecentResult();
-      }
-    }
-
-    if (versionEntry) {
-      if (versionEntry.structure_version !== newVersionEntry.structure_version) {
-        this.logger('Invalidating pre-aggregation structure', {
-          preAggregation: this.preAggregation,
-          requestId: this.requestId,
-          queryKey: this.preAggregationQueryKey(invalidationKeys),
-          newVersionEntry
-        });
-        await this.executeInQueue(invalidationKeys, this.priority(10), newVersionEntry);
-        return mostRecentResult();
-      } else if (versionEntry.content_version !== newVersionEntry.content_version) {
-        if (this.waitForRenew) {
-          this.logger('Waiting for pre-aggregation renew', {
-            preAggregation: this.preAggregation,
-            requestId: this.requestId,
-            queryKey: this.preAggregationQueryKey(invalidationKeys),
-            newVersionEntry
-          });
-          await this.executeInQueue(invalidationKeys, this.priority(0), newVersionEntry);
-          return mostRecentResult();
-        } else {
-          this.scheduleRefresh(invalidationKeys, newVersionEntry);
-        }
-      }
-    } else {
-      this.logger('Creating pre-aggregation from scratch', {
-        preAggregation: this.preAggregation,
-        requestId: this.requestId,
-        queryKey: this.preAggregationQueryKey(invalidationKeys),
-        newVersionEntry
-      });
-      await this.executeInQueue(invalidationKeys, this.priority(10), newVersionEntry);
-      return mostRecentResult();
-    }
-    const targetTableName = this.targetTableName(versionEntry);
-    this.updateLastTouch(targetTableName);
-    return {
-      targetTableName,
-      refreshKeyValues: [],
-      lastUpdatedAt: versionEntry.last_updated_at,
-      buildRangeEnd: versionEntry.build_range_end,
-    };
-  }
-
-  private updateLastTouch(tableName: string) {
-    this.preAggregations.updateLastTouch(tableName).catch(e => {
-      this.logger('Error on pre-aggregation touch', {
-        error: (e.stack || e), preAggregation: this.preAggregation, requestId: this.requestId,
-      });
-    });
-  }
-
-  protected contentVersion(invalidationKeys) {
-    const versionArray = [this.preAggregation.structureVersionLoadSql || this.preAggregation.loadSql];
-    if (this.preAggregation.indexesSql && this.preAggregation.indexesSql.length) {
-      versionArray.push(this.preAggregation.indexesSql);
-    }
-    if (this.preAggregation.streamOffset) {
-      versionArray.push(this.preAggregation.streamOffset);
-    }
-    if (this.preAggregation.outputColumnTypes) {
-      versionArray.push(this.preAggregation.outputColumnTypes);
-    }
-    versionArray.push(invalidationKeys);
-    return version(versionArray);
-  }
-
-  protected priority(defaultValue: number): number {
-    return this.preAggregation.priority != null ? this.preAggregation.priority : defaultValue;
-  }
-
-  protected getInvalidationKeyValues() {
-    return Promise.all(
-      (this.preAggregation.invalidateKeyQueries || []).map(
-        (sqlQuery) => this.loadCache.keyQueryResult(sqlQuery, this.waitForRenew, this.priority(10))
-      )
-    );
-  }
-
-  protected getPartitionInvalidationKeyValues() {
-    if (this.preAggregation.partitionInvalidateKeyQueries) {
-      return Promise.all(
-        (this.preAggregation.partitionInvalidateKeyQueries || []).map(
-          (sqlQuery) => this.loadCache.keyQueryResult(sqlQuery, this.waitForRenew, this.priority(10))
-        )
-      );
-    } else {
-      return this.getInvalidationKeyValues();
-    }
-  }
-
-  protected scheduleRefresh(invalidationKeys, newVersionEntry) {
-    this.logger('Refreshing pre-aggregation content', {
-      preAggregation: this.preAggregation,
-      requestId: this.requestId,
-      queryKey: this.preAggregationQueryKey(invalidationKeys),
-      newVersionEntry
-    });
-    this.executeInQueue(invalidationKeys, this.priority(0), newVersionEntry)
-      .catch(e => {
-        if (!(e instanceof ContinueWaitError)) {
-          this.logger('Error refreshing pre-aggregation', {
-            error: (e.stack || e), preAggregation: this.preAggregation, requestId: this.requestId
-          });
-        }
-      });
-  }
-
-  protected async executeInQueue(invalidationKeys, priority, newVersionEntry) {
-    const queue = await this.preAggregations.getQueue(this.preAggregation.dataSource);
-    return queue.executeInQueue(
-      'query',
-      this.preAggregationQueryKey(invalidationKeys),
-      {
-        preAggregation: this.preAggregation,
-        preAggregationsTablesToTempTables: this.preAggregationsTablesToTempTables,
-        newVersionEntry,
-        requestId: this.requestId,
-        invalidationKeys,
-        forceBuild: this.forceBuild,
-        isJob: this.isJob,
-        metadata: this.metadata,
-        orphanedTimeout: this.orphanedTimeout,
-      },
-      priority,
-      // eslint-disable-next-line no-use-before-define
-      { stageQueryKey: PreAggregations.preAggregationQueryCacheKey(this.preAggregation), requestId: this.requestId }
-    );
-  }
-
-  protected preAggregationQueryKey(invalidationKeys: InvalidationKeys): QueryKey {
-    return this.preAggregation.indexesSql && this.preAggregation.indexesSql.length ?
-      [this.preAggregation.loadSql, this.preAggregation.indexesSql, invalidationKeys] :
-      [this.preAggregation.loadSql, invalidationKeys];
-  }
-
-  protected targetTableName(versionEntry: VersionEntry): string {
-    // eslint-disable-next-line no-use-before-define
-    return PreAggregations.targetTableName(versionEntry);
-  }
-
-  public refresh(newVersionEntry: VersionEntry, invalidationKeys: InvalidationKeys, client) {
-    this.updateLastTouch(this.targetTableName(newVersionEntry));
-    let refreshStrategy = this.refreshStoreInSourceStrategy;
-    if (this.preAggregation.external) {
-      const readOnly =
-        this.preAggregation.readOnly ||
-        client.config && client.config.readOnly ||
-        client.readOnly && (typeof client.readOnly === 'boolean' ? client.readOnly : client.readOnly());
-
-      if (readOnly) {
-        refreshStrategy = this.refreshReadOnlyExternalStrategy;
-      } else {
-        refreshStrategy = this.refreshWriteStrategy;
-      }
-    }
-    return cancelCombinator(
-      saveCancelFn => refreshStrategy.bind(this)(
-        client,
-        newVersionEntry,
-        saveCancelFn,
-        invalidationKeys
-      )
-    );
-  }
-
-  protected logExecutingSql(payload) {
-    this.logger(
-      'Executing Load Pre Aggregation SQL',
-      payload
-    );
-  }
-
-  protected queryOptions(invalidationKeys: InvalidationKeys, query: string, params: unknown[], targetTableName: string, newVersionEntry: VersionEntry) {
-    return {
-      queryKey: this.preAggregationQueryKey(invalidationKeys),
-      query,
-      values: params,
-      targetTableName,
-      requestId: this.requestId,
-      newVersionEntry,
-      buildRangeEnd: this.preAggregation.buildRangeEnd,
-    };
-  }
-
-  protected async refreshStoreInSourceStrategy(
-    client: DriverInterface,
-    newVersionEntry: VersionEntry,
-    saveCancelFn: SaveCancelFn,
-    invalidationKeys: InvalidationKeys
-  ) {
-    const [loadSql, params] =
-        Array.isArray(this.preAggregation.loadSql) ? this.preAggregation.loadSql : [this.preAggregation.loadSql, []];
-    const targetTableName = this.targetTableName(newVersionEntry);
-    const query = (
-      <string>QueryCache.replacePreAggregationTableNames(
-        loadSql,
-        this.preAggregationsTablesToTempTables,
-      )
-    ).replace(
-      this.preAggregation.tableName,
-      targetTableName
-    );
-    const queryOptions = this.queryOptions(invalidationKeys, query, params, targetTableName, newVersionEntry);
-    this.logExecutingSql(queryOptions);
-
-    try {
-      // TODO move index creation to the driver
-      await saveCancelFn(client.loadPreAggregationIntoTable(
-        targetTableName,
-        query,
-        params,
-        {
-          streamOffset: this.preAggregation.streamOffset,
-          outputColumnTypes: this.preAggregation.outputColumnTypes,
-          ...queryOptions
-        }
-      ));
-
-      await this.createIndexes(client, newVersionEntry, saveCancelFn, queryOptions);
-      await this.loadCache.fetchTables(this.preAggregation);
-    } finally {
-      // We must clean orphaned in any cases: success or exception
-      await this.dropOrphanedTables(client, targetTableName, saveCancelFn, false, queryOptions);
-      await this.loadCache.fetchTables(this.preAggregation);
-    }
-  }
-
-  protected async refreshWriteStrategy(
-    client: DriverInterface,
-    newVersionEntry: VersionEntry,
-    saveCancelFn: SaveCancelFn,
-    invalidationKeys: InvalidationKeys,
-  ) {
-    const capabilities = client?.capabilities();
-
-    const withTempTable = !(capabilities?.unloadWithoutTempTable);
-    const dropSourceTempTable = !capabilities?.streamingSource;
-
-    return this.runWriteStrategy(
-      client,
-      newVersionEntry,
-      saveCancelFn,
-      invalidationKeys,
-      withTempTable,
-      dropSourceTempTable
-    );
-  }
-
-  /**
-   * Runs export strategy with write access in data source
-   */
-  protected async runWriteStrategy(
-    client: DriverInterface,
-    newVersionEntry: VersionEntry,
-    saveCancelFn: SaveCancelFn,
-    invalidationKeys: InvalidationKeys,
-    withTempTable: boolean,
-    dropSourceTempTable: boolean,
-  ) {
-    if (withTempTable) {
-      await client.createSchemaIfNotExists(this.preAggregation.preAggregationsSchema);
-    }
-    const targetTableName = this.targetTableName(newVersionEntry);
-    const queryOptions = await this.prepareWriteStrategy(
-      client,
-      targetTableName,
-      newVersionEntry,
-      saveCancelFn,
-      invalidationKeys,
-      withTempTable,
-    );
-
-    try {
-      const tableData = await this.downloadExternalPreAggregation(
-        client,
-        newVersionEntry,
-        saveCancelFn,
-        queryOptions,
-        withTempTable,
-      );
-
-      try {
-        await this.uploadExternalPreAggregation(tableData, newVersionEntry, saveCancelFn, queryOptions);
-      } finally {
-        if (tableData && tableData.release) {
-          await tableData.release();
-        }
-      }
-    } finally {
-      await this.cleanupWriteStrategy(
-        client,
-        targetTableName,
-        queryOptions,
-        saveCancelFn,
-        withTempTable,
-        dropSourceTempTable,
-      );
-    }
-  }
-
-  /**
-   * Cleanup tables after write strategy
-   */
-  protected async cleanupWriteStrategy(
-    client: DriverInterface,
-    targetTableName: string,
-    queryOptions: QueryOptions,
-    saveCancelFn: SaveCancelFn,
-    withTempTable: boolean,
-    dropSourceTempTable: boolean,
-  ) {
-    if (withTempTable && dropSourceTempTable) {
-      await this.withDropLock(false, async () => {
-        this.logger('Dropping source temp table', queryOptions);
-
-        const actualTables = await client.getTablesQuery(this.preAggregation.preAggregationsSchema);
-        const mappedActualTables = actualTables.map(t => `${this.preAggregation.preAggregationsSchema}.${t.table_name || t.TABLE_NAME}`);
-        if (mappedActualTables.includes(targetTableName)) {
-          await client.dropTable(targetTableName);
-        }
-      });
-    }
-
-    // We must clean orphaned in any cases: success or exception
-    await this.loadCache.fetchTables(this.preAggregation);
-    await this.dropOrphanedTables(client, targetTableName, saveCancelFn, false, queryOptions);
-  }
-
-  /**
-   * Create table (if required) and prepares query options object
-   */
-  protected async prepareWriteStrategy(
-    client: DriverInterface,
-    targetTableName: string,
-    newVersionEntry: VersionEntry,
-    saveCancelFn: SaveCancelFn,
-    invalidationKeys: InvalidationKeys,
-    withTempTable: boolean
-  ): Promise<QueryOptions> {
-    if (withTempTable) {
-      const [loadSql, params] =
-      Array.isArray(this.preAggregation.loadSql) ? this.preAggregation.loadSql : [this.preAggregation.loadSql, []];
-
-      const query = (
-        <string>QueryCache.replacePreAggregationTableNames(
-          loadSql,
-          this.preAggregationsTablesToTempTables,
-        )
-      ).replace(
-        this.preAggregation.tableName,
-        targetTableName
-      );
-      const queryOptions = this.queryOptions(invalidationKeys, query, params, targetTableName, newVersionEntry);
-      this.logExecutingSql(queryOptions);
-      await saveCancelFn(client.loadPreAggregationIntoTable(
-        targetTableName,
-        query,
-        params,
-        {
-          streamOffset: this.preAggregation.streamOffset,
-          outputColumnTypes: this.preAggregation.outputColumnTypes,
-          ...queryOptions
-        }
-      ));
-
-      return queryOptions;
-    } else {
-      const [sql, params] =
-        Array.isArray(this.preAggregation.sql) ? this.preAggregation.sql : [this.preAggregation.sql, []];
-      const queryOptions = this.queryOptions(invalidationKeys, sql, params, targetTableName, newVersionEntry);
-      this.logExecutingSql(queryOptions);
-      return queryOptions;
-    }
-  }
-
-  /**
-   * Strategy to copy pre-aggregation from source db (for read-only permissions) to external data
-   */
-  protected async refreshReadOnlyExternalStrategy(
-    client: DriverInterface,
-    newVersionEntry: VersionEntry,
-    saveCancelFn: SaveCancelFn,
-    invalidationKeys: InvalidationKeys
-  ) {
-    const [sql, params] =
-        Array.isArray(this.preAggregation.sql) ? this.preAggregation.sql : [this.preAggregation.sql, []];
-
-    const queryOptions = this.queryOptions(invalidationKeys, sql, params, this.targetTableName(newVersionEntry), newVersionEntry);
-    this.logExecutingSql(queryOptions);
-    this.logger('Downloading external pre-aggregation via query', queryOptions);
-    const externalDriver = await this.externalDriverFactory();
-    const capabilities = externalDriver.capabilities && externalDriver.capabilities();
-
-    let tableData: DownloadQueryResultsResult;
-
-    if (capabilities.csvImport && client.unloadFromQuery && await client.isUnloadSupported(this.getUnloadOptions())) {
-      tableData = await saveCancelFn(
-        client.unloadFromQuery(
-          sql,
-          params,
-          this.getUnloadOptions(),
-        )
-      ).catch((error: any) => {
-        this.logger('Downloading external pre-aggregation via query error', { ...queryOptions, error: error.stack || error.message });
-        throw error;
-      });
-    } else {
-      tableData = await saveCancelFn(client.downloadQueryResults(
-        sql,
-        params, {
-          streamOffset: this.preAggregation.streamOffset,
-          outputColumnTypes: this.preAggregation.outputColumnTypes,
-          ...queryOptions,
-          ...capabilities,
-          ...this.getStreamingOptions(),
-        }
-      )).catch((error: any) => {
-        this.logger('Downloading external pre-aggregation via query error', { ...queryOptions, error: error.stack || error.message });
-        throw error;
-      });
-    }
-
-    this.logger('Downloading external pre-aggregation via query completed', {
-      ...queryOptions,
-      isUnloadSupported: isDownloadTableCSVData(tableData)
-    });
-
-    try {
-      await this.uploadExternalPreAggregation(tableData, newVersionEntry, saveCancelFn, queryOptions);
-    } finally {
-      if (tableData.release) {
-        await tableData.release();
-      }
-    }
-
-    await this.loadCache.fetchTables(this.preAggregation);
-  }
-
-  protected getUnloadOptions(): UnloadOptions {
-    return {
-      // Default: 16mb for Snowflake, Should be specified in MBs, because drivers convert it
-      maxFileSize: 64
-    };
-  }
-
-  protected getStreamingOptions(): StreamOptions {
-    return {
-      // Default: 16384 (16KB), or 16 for objectMode streams. PostgreSQL/MySQL use object streams
-      highWaterMark: 10000
-    };
-  }
-
-  /**
-   * prepares download data for future cube store usage
-   */
-  protected async downloadExternalPreAggregation(
-    client: DriverInterface,
-    newVersionEntry: VersionEntry,
-    saveCancelFn: SaveCancelFn,
-    queryOptions: QueryOptions,
-    withTempTable: boolean
-  ) {
-    const table = this.targetTableName(newVersionEntry);
-    this.logger('Downloading external pre-aggregation', queryOptions);
-
-    try {
-      const externalDriver = await this.externalDriverFactory();
-      const capabilities = externalDriver.capabilities && externalDriver.capabilities();
-
-      let tableData: DownloadTableData;
-      if (withTempTable) {
-        tableData = await this.getTableDataWithTempTable(client, table, saveCancelFn, queryOptions, capabilities);
-      } else {
-        tableData = await this.getTableDataWithoutTempTable(client, table, saveCancelFn, queryOptions, capabilities);
-      }
-
-      this.logger('Downloading external pre-aggregation completed', {
-        ...queryOptions,
-        isUnloadSupported: isDownloadTableCSVData(tableData)
-      });
-
-      return tableData;
-    } catch (error: any) {
-      this.logger('Downloading external pre-aggregation error', {
-        ...queryOptions,
-        error: error?.stack || error?.message
-      });
-      throw error;
-    }
-  }
-
-  /**
-   * prepares download data when temp table = true
-   */
-  protected async getTableDataWithTempTable(client: DriverInterface, table: string, saveCancelFn: SaveCancelFn, queryOptions: QueryOptions, externalDriverCapabilities: DriverCapabilities) {
-    let tableData: DownloadTableData;
-
-    if (externalDriverCapabilities.csvImport && client.unload && await client.isUnloadSupported(this.getUnloadOptions())) {
-      tableData = await saveCancelFn(
-        client.unload(table, this.getUnloadOptions()),
-      );
-    } else if (externalDriverCapabilities.streamImport && client.stream) {
-      tableData = await saveCancelFn(
-        client.stream(`SELECT * FROM ${table}`, [], this.getStreamingOptions())
-      );
-
-      if (client.unload) {
-        const stream = new LargeStreamWarning(this.preAggregation.preAggregationId, (msg) => {
-          this.logger('Downloading external pre-aggregation warning', {
-            ...queryOptions,
-            error: msg
-          });
-        });
-        tableData.rowStream.pipe(stream);
-        tableData.rowStream = stream;
-      }
-    } else {
-      tableData = await saveCancelFn(client.downloadTable(table, {
-        streamOffset: this.preAggregation.streamOffset,
-        outputColumnTypes: this.preAggregation.outputColumnTypes,
-        ...externalDriverCapabilities
-      }));
-    }
-
-    if (!tableData.types) {
-      tableData.types = await saveCancelFn(client.tableColumnTypes(table));
-    }
-
-    return tableData;
-  }
-
-  /**
-   * prepares download data when temp table = false
-   */
-  protected async getTableDataWithoutTempTable(client: DriverInterface, table: string, saveCancelFn: SaveCancelFn, queryOptions: QueryOptions, externalDriverCapabilities: DriverCapabilities) {
-    const [sql, params] =
-        Array.isArray(this.preAggregation.sql) ? this.preAggregation.sql : [this.preAggregation.sql, []];
-
-    let tableData: DownloadTableData;
-
-    if (externalDriverCapabilities.csvImport && client.unload && await client.isUnloadSupported(this.getUnloadOptions())) {
-      return saveCancelFn(
-        client.unload(
-          table,
-          { ...this.getUnloadOptions(), query: { sql, params } },
-        )
-      );
-    } else if (externalDriverCapabilities.streamImport && client.stream) {
-      tableData = await saveCancelFn(
-        client.stream(sql, params, this.getStreamingOptions())
-      );
-
-      if (client.unload) {
-        const stream = new LargeStreamWarning(this.preAggregation.preAggregationId, (msg) => {
-          this.logger('Downloading external pre-aggregation warning', {
-            ...queryOptions,
-            error: msg
-          });
-        });
-        tableData.rowStream.pipe(stream);
-        tableData.rowStream = stream;
-      }
-    } else {
-      tableData = { rows: await saveCancelFn(client.query(sql, params)) };
-    }
-
-    if (!tableData.types && client.queryColumnTypes) {
-      tableData.types = await saveCancelFn(client.queryColumnTypes(sql, params));
-    }
-
-    return tableData;
-  }
-
-  protected async uploadExternalPreAggregation(
-    tableData: DownloadTableData,
-    newVersionEntry: VersionEntry,
-    saveCancelFn: SaveCancelFn,
-    queryOptions: QueryOptions
-  ) {
-    const externalDriver: DriverInterface = await this.externalDriverFactory();
-    const table = this.targetTableName(newVersionEntry);
-
-    this.logger('Uploading external pre-aggregation', queryOptions);
-    await saveCancelFn(
-      externalDriver.uploadTableWithIndexes(
-        table,
-        tableData.types,
-        tableData,
-        this.prepareIndexesSql(newVersionEntry, queryOptions),
-        this.preAggregation.uniqueKeyColumns,
-        queryOptions,
-        {
-          aggregationsColumns: this.preAggregation.aggregationsColumns,
-          createTableIndexes: this.prepareCreateTableIndexes(newVersionEntry),
-          sealAt: this.preAggregation.sealAt
-        }
-      )
-    ).catch((error: any) => {
-      this.logger('Uploading external pre-aggregation error', { ...queryOptions, error: error?.stack || error?.message });
-      throw error;
-    });
-    this.logger('Uploading external pre-aggregation completed', queryOptions);
-
-    await this.loadCache.fetchTables(this.preAggregation);
-    await this.dropOrphanedTables(externalDriver, table, saveCancelFn, true, queryOptions);
-  }
-
-  protected async createIndexes(driver, newVersionEntry: VersionEntry, saveCancelFn: SaveCancelFn, queryOptions: QueryOptions) {
-    const indexesSql = this.prepareIndexesSql(newVersionEntry, queryOptions);
-    for (let i = 0; i < indexesSql.length; i++) {
-      const [query, params] = indexesSql[i].sql;
-      await saveCancelFn(driver.query(query, params));
-    }
-  }
-
-  protected prepareIndexesSql(newVersionEntry: VersionEntry, queryOptions: QueryOptions) {
-    if (!this.preAggregation.indexesSql || !this.preAggregation.indexesSql.length) {
-      return [];
-    }
-    return this.preAggregation.indexesSql.map(({ sql, indexName }) => {
-      const [query, params] = sql;
-      const indexVersionEntry = {
-        ...newVersionEntry,
-        table_name: indexName
-      };
-      this.logger('Creating pre-aggregation index', queryOptions);
-      const resultingSql = QueryCache.replacePreAggregationTableNames(
-        query,
-        this.preAggregationsTablesToTempTables.concat([
-          [this.preAggregation.tableName, { targetTableName: this.targetTableName(newVersionEntry) }],
-          [indexName, { targetTableName: this.targetTableName(indexVersionEntry) }]
-        ])
-      );
-      return { sql: [resultingSql, params] };
-    });
-  }
-
-  protected prepareCreateTableIndexes(newVersionEntry: VersionEntry) {
-    if (!this.preAggregation.createTableIndexes || !this.preAggregation.createTableIndexes.length) {
-      return [];
-    }
-    return this.preAggregation.createTableIndexes.map(({ indexName, type, columns }) => {
-      const indexVersionEntry = {
-        ...newVersionEntry,
-        table_name: indexName
-      };
-      return { indexName: this.targetTableName(indexVersionEntry), type, columns };
-    });
-  }
-
-  private async withDropLock<T>(external: boolean, lockFn: () => MaybeCancelablePromise<T>): Promise<boolean> {
-    const lockKey = this.dropLockKey(external);
-    return this.queryCache.withLock(lockKey, 60 * 5, lockFn);
-  }
-
-  protected async dropOrphanedTables(
-    client: DriverInterface,
-    justCreatedTable: string,
-    saveCancelFn: SaveCancelFn,
-    external: boolean,
-    queryOptions: QueryOptions
-  ) {
-    await this.preAggregations.addTableUsed(justCreatedTable);
-
-    return this.withDropLock(external, async () => {
-      this.logger('Dropping orphaned tables', { ...queryOptions, external });
-      const actualTables = await client.getTablesQuery(
-        this.preAggregation.preAggregationsSchema,
-      );
-      const versionEntries = tablesToVersionEntries(
-        this.preAggregation.preAggregationsSchema,
-        actualTables,
-      );
-      const versionEntriesToSave = R.pipe<
-        VersionEntry[],
-        { [index: string]: VersionEntry[] },
-        Array<[string, VersionEntry[]]>,
-        VersionEntry[]
-        >(
-          R.groupBy(v => v.table_name),
-          R.toPairs,
-          R.map(p => p[1][0])
-        )(versionEntries);
-      const structureVersionsToSave = R.pipe<
-        VersionEntry[],
-        VersionEntry[],
-        { [index: string]: VersionEntry[] },
-        Array<[string, VersionEntry[]]>,
-        VersionEntry[]
-        >(
-          R.filter(
-            (v: VersionEntry) => (
-              new Date().getTime() - v.last_updated_at <
-              this.structureVersionPersistTime * 1000
-            )
-          ),
-          R.groupBy(v => `${v.table_name}_${v.structure_version}`),
-          R.toPairs,
-          R.map(p => p[1][0])
-        )(versionEntries);
-
-      const refreshEndReached = await this.preAggregations.getRefreshEndReached();
-      const toSave =
-        this.preAggregations.dropPreAggregationsWithoutTouch && refreshEndReached
-          ? (await this.preAggregations.tablesUsed())
-            .concat(await this.preAggregations.tablesTouched())
-            .concat([justCreatedTable])
-          : (await this.preAggregations.tablesUsed())
-            .concat(structureVersionsToSave.map(v => this.targetTableName(v)))
-            .concat(versionEntriesToSave.map(v => this.targetTableName(v)))
-            .concat([justCreatedTable]);
-      const toDrop = actualTables
-        .map(t => `${this.preAggregation.preAggregationsSchema}.${t.table_name || t.TABLE_NAME}`)
-        .filter(t => toSave.indexOf(t) === -1);
-
-      await Promise.all(toDrop.map(table => saveCancelFn(client.dropTable(table))));
-      this.logger('Dropping orphaned tables completed', {
-        ...queryOptions,
-        external,
-        tablesToDrop: JSON.stringify(toDrop),
-      });
-    });
-  }
-
-  private dropLockKey(external: boolean) {
-    return external
-      ? 'drop-orphaned-tables-external'
-      : `drop-orphaned-tables:${this.preAggregation.dataSource}`;
-  }
-}
-
-interface PreAggsPartitionRangeLoaderOpts {
-  maxPartitions: number;
-  maxSourceRowLimit: number;
-  waitForRenew?: boolean;
-  requestId?: string;
-  externalRefresh?: boolean;
-  forceBuild?: boolean;
-  metadata?: any;
-  orphanedTimeout?: number;
-  lambdaQuery?: LambdaQuery;
-  isJob?: boolean;
-  compilerCacheFn?: <T>(subKey: string[], cacheFn: () => T) => T;
-}
-
-export class PreAggregationPartitionRangeLoader {
-  /**
-   * Determines whether current instance instantiated for a jobed build query
-   * (initialized by the /cubejs-system/v1/pre-aggregations/jobs endpoint) or
-   * not.
-   */
-  protected isJob: boolean;
-
-  protected waitForRenew: boolean;
-
-  protected requestId: string;
-
-  protected lambdaQuery: LambdaQuery;
-
-  protected dataSource: string;
-
-  protected compilerCacheFn: <T>(subKey: string[], cacheFn: () => T) => T;
-
-  public constructor(
-    private readonly redisPrefix: string,
-    private readonly driverFactory: DriverFactory,
-    private readonly logger: any,
-    private readonly queryCache: QueryCache,
-    // eslint-disable-next-line no-use-before-define
-    private readonly preAggregations: PreAggregations,
-    private readonly preAggregation: PreAggregationDescription,
-    private readonly preAggregationsTablesToTempTables: [string, LoadPreAggregationResult][],
-    private readonly loadCache: PreAggregationLoadCache,
-    private readonly options: PreAggsPartitionRangeLoaderOpts = {
-      maxPartitions: 10000,
-      maxSourceRowLimit: 10000,
-    },
-  ) {
-    this.isJob = !!options.isJob;
-    this.waitForRenew = options.waitForRenew;
-    this.requestId = options.requestId;
-    this.lambdaQuery = options.lambdaQuery;
-    this.dataSource = preAggregation.dataSource;
-    this.compilerCacheFn = options.compilerCacheFn || ((subKey, cacheFn) => cacheFn());
-  }
-
-  private async loadRangeQuery(rangeQuery: QueryTuple, partitionRange?: QueryDateRange) {
-    const [query, values, queryOptions]: QueryTuple = rangeQuery;
-    const invalidate =
-      this.preAggregation.invalidateKeyQueries &&
-      this.preAggregation.invalidateKeyQueries[0]
-        ? this.preAggregation.invalidateKeyQueries[0].slice(0, 2)
-        : false;
-
-    return this.queryCache.cacheQueryResult(
-      query,
-      <string[]>values,
-      QueryCache.queryCacheKey({
-        query,
-        values: (<string[]>values),
-        invalidate,
-      }),
-      24 * 60 * 60,
-      {
-        renewalThreshold: this.queryCache.options.refreshKeyRenewalThreshold
-          || queryOptions?.renewalThreshold || 24 * 60 * 60,
-        waitForRenew: this.waitForRenew,
-        priority: this.priority(10),
-        requestId: this.requestId,
-        dataSource: this.dataSource,
-        useInMemory: true,
-        external: queryOptions?.external,
-        renewalKey: partitionRange ? await this.getInvalidationKeyValues(partitionRange) : null,
-      }
-    );
-  }
-
-  protected getInvalidationKeyValues(range) {
-    const partitionTableName = PreAggregationPartitionRangeLoader.partitionTableName(
-      this.preAggregation.tableName, this.preAggregation.partitionGranularity, range
-    );
-    return Promise.all(
-      (this.preAggregation.invalidateKeyQueries || []).map(
-        (sqlQuery) => (
-          this.loadCache.keyQueryResult(
-            this.replacePartitionSqlAndParams(sqlQuery, range, partitionTableName), this.waitForRenew, this.priority(10)
-          )
-        )
-      )
-    );
-  }
-
-  protected priority(defaultValue) {
-    return this.preAggregation.priority != null ? this.preAggregation.priority : defaultValue;
-  }
-
-  public async replaceQueryBuildRangeParams(queryValues: string[]): Promise<string[] | null> {
-    if (queryValues?.find(p => p === BUILD_RANGE_START_LOCAL || p === BUILD_RANGE_END_LOCAL)) {
-      const [buildRangeStart, buildRangeEnd] = await this.loadBuildRange();
-      return queryValues?.map(
-        param => {
-          if (param === BUILD_RANGE_START_LOCAL) {
-            return utcToLocalTimeZone(this.preAggregation.timezone, this.preAggregation.timestampFormat, buildRangeStart);
-          } else if (param === BUILD_RANGE_END_LOCAL) {
-            return utcToLocalTimeZone(this.preAggregation.timezone, this.preAggregation.timestampFormat, buildRangeEnd);
-          } else {
-            return param;
-          }
-        },
-      );
-    }
-    return null;
-  }
-
-  private replacePartitionSqlAndParams(
-    query: QueryWithParams,
-    dateRange: QueryDateRange,
-    partitionTableName: string
-  ): QueryWithParams {
-    const [sql, params, options] = query;
-    const updateWindowToBoundary = options?.incremental && addSecondsToLocalTimestamp(
-      dateRange[1], this.preAggregation.timezone, options?.updateWindowSeconds || 0
-    );
-    return [sql.replace(this.preAggregation.tableName, partitionTableName), params?.map(
-      param => {
-        if (dateRange && param === FROM_PARTITION_RANGE) {
-          return PreAggregationPartitionRangeLoader.inDbTimeZone(this.preAggregation, dateRange[0]);
-        } else if (dateRange && param === TO_PARTITION_RANGE) {
-          return PreAggregationPartitionRangeLoader.inDbTimeZone(this.preAggregation, dateRange[1]);
-        } else {
-          return param;
-        }
-      },
-    ), {
-      ...options,
-      renewalThreshold:
-        options?.incremental && updateWindowToBoundary < new Date() ?
-          // if updateWindowToBoundary passed just moments ago we want to renew it earlier in case
-          // of server and db clock don't match
-          Math.min(
-            Math.round((new Date().getTime() - updateWindowToBoundary.getTime()) / 1000),
-            options?.renewalThresholdOutsideUpdateWindow
-          ) :
-          options?.renewalThreshold
-    }];
-  }
-
-  private partitionPreAggregationDescription(range: QueryDateRange, buildRange: QueryDateRange): PreAggregationDescription {
-    const partitionTableName = PreAggregationPartitionRangeLoader.partitionTableName(
-      this.preAggregation.tableName, this.preAggregation.partitionGranularity, range
-    );
-    const [_, buildRangeEnd] = buildRange;
-    const loadRange: [string, string] = [...range];
-    const partitionInvalidateKeyQueries = this.preAggregation.partitionInvalidateKeyQueries || this.preAggregation.invalidateKeyQueries;
-    // `partitionInvalidateKeyQueries = []` in case of real time
-    if ((!partitionInvalidateKeyQueries || partitionInvalidateKeyQueries.length > 0) && buildRangeEnd < range[1]) {
-      loadRange[1] = buildRangeEnd;
-    }
-    const sealAt = addSecondsToLocalTimestamp(
-      loadRange[1], this.preAggregation.timezone, this.preAggregation.updateWindowSeconds || 0
-    ).toISOString();
-    return {
-      ...this.preAggregation,
-      tableName: partitionTableName,
-      structureVersionLoadSql: this.preAggregation.loadSql &&
-        this.replacePartitionSqlAndParams(this.preAggregation.loadSql, range, partitionTableName),
-      loadSql: this.preAggregation.loadSql &&
-        this.replacePartitionSqlAndParams(this.preAggregation.loadSql, loadRange, partitionTableName),
-      sql: this.preAggregation.sql &&
-        this.replacePartitionSqlAndParams(this.preAggregation.sql, loadRange, partitionTableName),
-      invalidateKeyQueries: (this.preAggregation.invalidateKeyQueries || [])
-        .map(q => this.replacePartitionSqlAndParams(q, range, partitionTableName)),
-      partitionInvalidateKeyQueries: this.preAggregation.partitionInvalidateKeyQueries &&
-        this.preAggregation.partitionInvalidateKeyQueries.map(q => this.replacePartitionSqlAndParams(q, range, partitionTableName)),
-      indexesSql: (this.preAggregation.indexesSql || [])
-        .map(q => ({ ...q, sql: this.replacePartitionSqlAndParams(q.sql, range, partitionTableName) })),
-      previewSql: this.preAggregation.previewSql &&
-        this.replacePartitionSqlAndParams(this.preAggregation.previewSql, range, partitionTableName),
-      buildRangeStart: loadRange[0],
-      buildRangeEnd: loadRange[1],
-      sealAt, // Used only for kSql pre aggregations
-    };
-  }
-
-  public async loadPreAggregations(): Promise<LoadPreAggregationResult> {
-    if (this.preAggregation.partitionGranularity && !this.preAggregation.expandedPartition) {
-      const loadPreAggregationsByPartitionRanges = async ({ buildRange, partitionRanges }: PartitionRanges) => {
-        const partitionLoaders = partitionRanges.map(range => new PreAggregationLoader(
-          this.redisPrefix,
-          this.driverFactory,
-          this.logger,
-          this.queryCache,
-          this.preAggregations,
-          this.partitionPreAggregationDescription(range, buildRange),
-          this.preAggregationsTablesToTempTables,
-          this.loadCache,
-          this.options,
-        ));
-        const resolveResults = await Promise.all(partitionLoaders.map(async (l, i) => {
-          const result = await l.loadPreAggregation(false);
-          return result && {
-            ...result,
-            partitionRange: partitionRanges[i]
-          };
-        }));
-        return { loadResults: resolveResults.filter(res => res !== null), partitionLoaders };
-      };
-
-      // eslint-disable-next-line prefer-const
-      let loadResultAndLoaders = await loadPreAggregationsByPartitionRanges(await this.partitionRanges());
-      if (this.options.externalRefresh && loadResultAndLoaders.loadResults.length === 0) {
-        loadResultAndLoaders = await loadPreAggregationsByPartitionRanges(await this.partitionRanges(true));
-        // In case there're no partitions ready at matched time dimension intersection then no data can be retrieved.
-        // We need to provide any table so query can just execute successfully.
-        if (loadResultAndLoaders.loadResults.length > 0) {
-          loadResultAndLoaders.loadResults = [loadResultAndLoaders.loadResults[loadResultAndLoaders.loadResults.length - 1]];
-        }
-      }
-      if (this.options.externalRefresh && loadResultAndLoaders.loadResults.length === 0) {
-        throw new Error(
-          // eslint-disable-next-line no-use-before-define
-          PreAggregations.noPreAggregationPartitionsBuiltMessage(loadResultAndLoaders.partitionLoaders.map(p => p.preAggregation))
-        );
-      }
-
-      let { loadResults } = loadResultAndLoaders;
-
-      let lambdaTable: InlineTable;
-      let emptyResult = false;
-
-      if (this.preAggregation.rollupLambdaId) {
-        if (this.lambdaQuery && loadResults.length > 0) {
-          const { buildRangeEnd, targetTableName } = loadResults[loadResults.length - 1];
-          const lambdaTypes = await this.loadCache.getTableColumnTypes(this.preAggregation, targetTableName);
-          lambdaTable = await this.downloadLambdaTable(buildRangeEnd, lambdaTypes);
-        }
-        const rollupLambdaResults = this.preAggregationsTablesToTempTables.filter(tempTableResult => tempTableResult[1].rollupLambdaId === this.preAggregation.rollupLambdaId);
-        const filteredResults = loadResults.filter(
-          r => (this.preAggregation.lastRollupLambda || reformatInIsoLocal(r.buildRangeEnd) === reformatInIsoLocal(r.partitionRange[1])) &&
-            rollupLambdaResults.every(result => !result[1].buildRangeEnd || reformatInIsoLocal(result[1].buildRangeEnd) < reformatInIsoLocal(r.partitionRange[0]))
-        );
-        if (filteredResults.length === 0) {
-          emptyResult = true;
-          loadResults = [loadResults[loadResults.length - 1]];
-        } else {
-          loadResults = filteredResults;
-        }
-      }
-
-      const allTableTargetNames = loadResults.map(targetTableName => targetTableName.targetTableName);
-      let lastUpdatedAt = getLastUpdatedAtTimestamp(loadResults.map(r => r.lastUpdatedAt));
-
-      if (lambdaTable) {
-        allTableTargetNames.push(lambdaTable.name);
-        lastUpdatedAt = Date.now();
-      }
-
-      const unionTargetTableName = allTableTargetNames
-        .map(targetTableName => `SELECT * FROM ${targetTableName}${emptyResult ? ' WHERE 1 = 0' : ''}`)
-        .join(' UNION ALL ');
-      return {
-        targetTableName: allTableTargetNames.length === 1 && !emptyResult ? allTableTargetNames[0] : `(${unionTargetTableName})`,
-        refreshKeyValues: loadResults.map(t => t.refreshKeyValues),
-        lastUpdatedAt,
-        buildRangeEnd: !emptyResult && loadResults.length && loadResults[loadResults.length - 1].buildRangeEnd,
-        lambdaTable,
-        rollupLambdaId: this.preAggregation.rollupLambdaId,
-      };
-    } else {
-      return new PreAggregationLoader(
-        this.redisPrefix,
-        this.driverFactory,
-        this.logger,
-        this.queryCache,
-        this.preAggregations,
-        this.preAggregation,
-        this.preAggregationsTablesToTempTables,
-        this.loadCache,
-        this.options
-      ).loadPreAggregation(true);
-    }
-  }
-
-  /**
-   * Downloads the lambda table from the source DB.
-   */
-  private async downloadLambdaTable(fromDate: string, lambdaTypes: TableStructure): Promise<InlineTable> {
-    const { sqlAndParams, cacheKeyQueries } = this.lambdaQuery;
-    const [query, params] = sqlAndParams;
-    const values = params.map((p) => {
-      if (p === FROM_PARTITION_RANGE) {
-        return fromDate;
-      }
-      if (p === MAX_SOURCE_ROW_LIMIT) {
-        return this.options.maxSourceRowLimit;
-      }
-      return p;
-    });
-    const { data } = await this.queryCache.renewQuery(
-      query,
-      <string[]>values,
-      cacheKeyQueries,
-      60 * 60,
-      [query, <string[]>values],
-      undefined,
-      {
-        requestId: this.requestId,
-        skipRefreshKeyWaitForRenew: false,
-        dataSource: this.dataSource,
-        external: false,
-        useCsvQuery: true,
-        lambdaTypes,
-      }
-    );
-    if (data.rowCount === this.options.maxSourceRowLimit) {
-      throw new Error(`The maximum number of source rows ${this.options.maxSourceRowLimit} was reached for ${this.preAggregation.preAggregationId}`);
-    }
-    return {
-      name: `${LAMBDA_TABLE_PREFIX}_${this.preAggregation.tableName.replace('.', '_')}`,
-      columns: data.types,
-      csvRows: data.csvRows,
-    };
-  }
-
-  public async partitionPreAggregations(): Promise<PreAggregationDescription[]> {
-    if (this.preAggregation.partitionGranularity && !this.preAggregation.expandedPartition) {
-      const { buildRange, partitionRanges } = await this.partitionRanges();
-      return this.compilerCacheFn(['partitions', JSON.stringify(buildRange)], () => partitionRanges.map(range => this.partitionPreAggregationDescription(range, buildRange)));
-    } else {
-      return [this.preAggregation];
-    }
-  }
-
-  private async partitionRanges(ignoreMatchedDateRange?: boolean): Promise<PartitionRanges> {
-    const buildRange = await this.loadBuildRange();
-    if (!buildRange[0] || !buildRange[1]) {
-      return { buildRange, partitionRanges: [] };
-    }
-    let dateRange = PreAggregationPartitionRangeLoader.intersectDateRanges(
-      buildRange,
-      ignoreMatchedDateRange ? undefined : this.preAggregation.matchedTimeDimensionDateRange,
-    );
-    if (!dateRange) {
-      // If there's no date range intersection between query data range and pre-aggregation build range
-      // use last partition so outer query can receive expected table structure.
-      dateRange = [buildRange[1], buildRange[1]];
-    }
-    const partitionRanges = this.compilerCacheFn(['timeSeries', this.preAggregation.partitionGranularity, JSON.stringify(dateRange), `${this.preAggregation.timestampPrecision}`], () => PreAggregationPartitionRangeLoader.timeSeries(
-      this.preAggregation.partitionGranularity,
-      dateRange,
-      this.preAggregation.timestampPrecision
-    ));
-    if (partitionRanges.length > this.options.maxPartitions) {
-      throw new Error(
-        `Pre-aggregation '${this.preAggregation.tableName}' requested to build ${partitionRanges.length} partitions which exceeds the maximum number of partitions per pre-aggregation of ${this.options.maxPartitions}`
-      );
-    }
-    return { buildRange: dateRange, partitionRanges };
-  }
-
-  public async loadBuildRange(): Promise<QueryDateRange> {
-    const { preAggregationStartEndQueries } = this.preAggregation;
-    const [startDate, endDate] = await Promise.all(
-      preAggregationStartEndQueries.map(
-        async rangeQuery => PreAggregationPartitionRangeLoader.extractDate(await this.loadRangeQuery(rangeQuery)),
-      ),
-    );
-    if (!this.preAggregation.partitionGranularity) {
-      return this.orNowIfEmpty([startDate, endDate]);
-    }
-    const wholeSeriesRanges = PreAggregationPartitionRangeLoader.timeSeries(
-      this.preAggregation.partitionGranularity,
-      this.orNowIfEmpty([startDate, endDate]),
-      this.preAggregation.timestampPrecision,
-    );
-    const [rangeStart, rangeEnd] = await Promise.all(
-      preAggregationStartEndQueries.map(
-        async (rangeQuery, i) => PreAggregationPartitionRangeLoader.extractDate(
-          await this.loadRangeQuery(
-            rangeQuery, i === 0 ? wholeSeriesRanges[0] : wholeSeriesRanges[wholeSeriesRanges.length - 1],
-          ),
-        ),
-      ),
-    );
-    return this.orNowIfEmpty([rangeStart, rangeEnd]);
-  }
-
-  private now() {
-    return utcToLocalTimeZone(this.preAggregation.timezone, 'YYYY-MM-DDTHH:mm:ss.SSS', new Date().toJSON().substring(0, 23));
-  }
-
-  private orNowIfEmpty(dateRange: QueryDateRange): QueryDateRange {
-    if (!dateRange[0] && !dateRange[1]) {
-      const now = this.now();
-      return [now, now];
-    }
-    if (!dateRange[0]) {
-      return [dateRange[1], dateRange[1]];
-    }
-    if (!dateRange[1]) {
-      return [dateRange[0], dateRange[0]];
-    }
-    return dateRange;
-  }
-
-  private static checkDataRangeType(range: QueryDateRange) {
-    if (!range) {
-      return;
-    }
-
-    if (range.length !== 2) {
-      throw new Error(`Date range expected to be an array with 2 elements but ${range} found`);
-    }
-
-    if (typeof range[0] !== 'string' || typeof range[1] !== 'string') {
-      throw new Error(`Date range expected to be a string array but ${range} found`);
-    }
-
-    if ((range[0].length !== 23 && range[0].length !== 26) || (range[1].length !== 23 && range[0].length !== 26)) {
-      throw new Error(`Date range expected to be in YYYY-MM-DDTHH:mm:ss.SSS format but ${range} found`);
-    }
-  }
-
-  public static intersectDateRanges(rangeA: QueryDateRange | null, rangeB: QueryDateRange | null): QueryDateRange {
-    PreAggregationPartitionRangeLoader.checkDataRangeType(rangeA);
-    PreAggregationPartitionRangeLoader.checkDataRangeType(rangeB);
-    if (!rangeB) {
-      return rangeA;
-    }
-    if (!rangeA) {
-      return rangeB;
-    }
-    const from = rangeA[0] > rangeB[0] ? rangeA[0] : rangeB[0];
-    const to = rangeA[1] < rangeB[1] ? rangeA[1] : rangeB[1];
-    if (from > to) {
-      return null;
-    }
-    return [
-      from,
-      to,
-    ];
-  }
-
-  public static timeSeries(granularity: string, dateRange: QueryDateRange, timestampPrecision: number): QueryDateRange[] {
-    return timeSeries(granularity, dateRange, {
-      timestampPrecision
-    });
-  }
-
-  public static partitionTableName(tableName: string, partitionGranularity: string, dateRange: string[]) {
-    const partitionSuffix = dateRange[0].substring(
-      0,
-      partitionGranularity === 'hour' ? 13 : 10
-    ).replace(/[-T:]/g, '');
-    return `${tableName}${partitionSuffix}`;
-  }
-
-  public static inDbTimeZone(preAggregationDescription: any, timestamp: string): string {
-    return inDbTimeZone(preAggregationDescription.timezone, preAggregationDescription.timestampFormat, timestamp);
-  }
-
-  public static extractDate(data: any): string {
-    return extractDate(data);
-  }
-
-  public static FROM_PARTITION_RANGE = FROM_PARTITION_RANGE;
-
-  public static TO_PARTITION_RANGE = TO_PARTITION_RANGE;
-}
-
 type PreAggregationsOptions = {
   maxPartitions: number;
   maxSourceRowLimit: number;
@@ -2114,7 +361,6 @@ export class PreAggregations {
   ): Promise<[boolean, string]> {
     // fetching tables
     const loadCache = new PreAggregationLoadCache(
-      this.redisPrefix,
       () => this.driverFactory(dataSource),
       this.queryCache,
       this,
@@ -2187,7 +433,6 @@ export class PreAggregations {
       if (!loadCacheByDataSource[`${dataSource}_${preAggregationSchema}`]) {
         loadCacheByDataSource[`${dataSource}_${preAggregationSchema}`] =
           new PreAggregationLoadCache(
-            this.redisPrefix,
             () => this.driverFactory(dataSource),
             this.queryCache,
             this,
@@ -2211,7 +456,6 @@ export class PreAggregations {
     const preAggregationsTablesToTempTablesPromise =
       preAggregations.map((p: PreAggregationDescription, i) => (preAggregationsTablesToTempTables) => {
         const loader = new PreAggregationPartitionRangeLoader(
-          this.redisPrefix,
           () => this.driverFactory(p.dataSource || 'default'),
           this.logger,
           this.queryCache,
@@ -2305,7 +549,6 @@ export class PreAggregations {
       if (!loadCacheByDataSource[`${dataSource}_${preAggregationSchema}`]) {
         loadCacheByDataSource[`${dataSource}_${preAggregationSchema}`] =
           new PreAggregationLoadCache(
-            this.redisPrefix,
             () => this.driverFactory(dataSource),
             this.queryCache,
             this,
@@ -2321,7 +564,6 @@ export class PreAggregations {
 
     const expandedPreAggregations: PreAggregationDescription[][] = await Promise.all(preAggregations.map(p => {
       const loader = new PreAggregationPartitionRangeLoader(
-        this.redisPrefix,
         () => this.driverFactory(p.dataSource || 'default'),
         this.logger,
         this.queryCache,
@@ -2365,7 +607,6 @@ export class PreAggregations {
               preAggregation, preAggregationsTablesToTempTables, newVersionEntry, requestId, invalidationKeys, buildRangeEnd
             } = q;
             const loader = new PreAggregationLoader(
-              this.redisPrefix,
               () => this.driverFactory(dataSource),
               this.logger,
               this.queryCache,
@@ -2373,7 +614,6 @@ export class PreAggregations {
               preAggregation,
               preAggregationsTablesToTempTables,
               new PreAggregationLoadCache(
-                this.redisPrefix,
                 () => this.driverFactory(dataSource),
                 this.queryCache,
                 this,
@@ -2421,7 +661,6 @@ export class PreAggregations {
             requestId
           } = q;
           const loadCache = new PreAggregationLoadCache(
-            this.redisPrefix,
             () => this.driverFactory(dataSource),
             this.queryCache,
             this,
@@ -2483,7 +722,6 @@ export class PreAggregations {
       if (!loadCacheByDataSource[`${dataSource}_${preAggregationSchema}`]) {
         loadCacheByDataSource[`${dataSource}_${preAggregationSchema}`] =
           new PreAggregationLoadCache(
-            this.redisPrefix,
             () => this.driverFactory(dataSource),
             this.queryCache,
             this,
@@ -2518,8 +756,7 @@ export class PreAggregations {
 
   public async getQueueState(dataSource: string) {
     const queue = await this.getQueue(dataSource);
-    const queries = await queue.getQueries();
-    return queries;
+    return queue.getQueries();
   }
 
   public async cancelQueriesFromQueue(queryKeys: string[], dataSource: string) {
diff --git a/packages/cubejs-query-orchestrator/src/orchestrator/QueryCache.ts b/packages/cubejs-query-orchestrator/src/orchestrator/QueryCache.ts
index 7a3a41f66f..a336bfe2ff 100644
--- a/packages/cubejs-query-orchestrator/src/orchestrator/QueryCache.ts
+++ b/packages/cubejs-query-orchestrator/src/orchestrator/QueryCache.ts
@@ -97,16 +97,16 @@ export type TempTable = {
  * definition (stored in the second element) link.
  */
 export type PreAggTableToTempTable = [
-  string, // common table name (without sufix)
+  string, // common table name (without suffix)
   TempTable,
 ];
 
+export type CacheKeyItem = string | string[] | QueryTuple | QueryTuple[] | undefined;
+
 export type CacheKey =
-  | string
-  | [
-    query: string | QueryTuple,
-    options?: string[]
-  ];
+  [CacheKeyItem, CacheKeyItem] |
+  [CacheKeyItem, CacheKeyItem, CacheKeyItem] |
+  [CacheKeyItem, CacheKeyItem, CacheKeyItem, CacheKeyItem];
 
 type CacheEntry = {
   time: number;
@@ -200,7 +200,7 @@ export class QueryCache {
   /**
    * Generates from the `queryBody` the final `sql` query and push it to
    * the queue. Returns promise which will be resolved by the different
-   * objects, depend from the original `queryBody` object. For the
+   * objects, depend on the original `queryBody` object. For the
    * persistent queries returns the `stream.Writable` instance.
    *
    * @throw Error
@@ -387,7 +387,7 @@ export class QueryCache {
   }
 
   public static queryCacheKey(queryBody: QueryBody): CacheKey {
-    const key = [
+    const key: CacheKey = [
       queryBody.query,
       queryBody.values,
       (queryBody.preAggregations || []).map(p => p.loadSql)
@@ -397,7 +397,7 @@ export class QueryCache {
     }
     // @ts-ignore
     key.persistent = queryBody.persistent;
-    return <CacheKey>key;
+    return key;
   }
 
   protected static replaceAll(replaceThis, withThis, inThis) {
diff --git a/packages/cubejs-query-orchestrator/src/orchestrator/QueryQueue.js b/packages/cubejs-query-orchestrator/src/orchestrator/QueryQueue.js
index 5536aa8805..fee5aa7250 100644
--- a/packages/cubejs-query-orchestrator/src/orchestrator/QueryQueue.js
+++ b/packages/cubejs-query-orchestrator/src/orchestrator/QueryQueue.js
@@ -236,7 +236,7 @@ export class QueryQueue {
         throw new Error('Priority should be between -10000 and 10000');
       }
 
-      // Result here won't be fetched for a forced build query and a jobed build
+      // Result here won't be fetched for a forced build query and a jobbed build
       // query (initialized by the /cubejs-system/v1/pre-aggregations/jobs
       // endpoint).
       let result = !query.forceBuild && await queueConnection.getResult(queryKey);
diff --git a/packages/cubejs-query-orchestrator/src/orchestrator/index.ts b/packages/cubejs-query-orchestrator/src/orchestrator/index.ts
index d91d52f587..e4a28e1cbc 100644
--- a/packages/cubejs-query-orchestrator/src/orchestrator/index.ts
+++ b/packages/cubejs-query-orchestrator/src/orchestrator/index.ts
@@ -3,6 +3,9 @@ export * from './ContinueWaitError';
 export * from './LocalCacheDriver';
 export * from './LocalQueueDriver';
 export * from './PreAggregations';
+export * from './PreAggregationPartitionRangeLoader';
+export * from './PreAggregationLoader';
+export * from './PreAggregationLoadCache';
 export * from './QueryCache';
 export * from './QueryOrchestrator';
 export * from './QueryQueue';
diff --git a/packages/cubejs-questdb-driver/CHANGELOG.md b/packages/cubejs-questdb-driver/CHANGELOG.md
index 38cf3aadcf..fe9c44a58c 100644
--- a/packages/cubejs-questdb-driver/CHANGELOG.md
+++ b/packages/cubejs-questdb-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/questdb-driver
diff --git a/packages/cubejs-questdb-driver/package.json b/packages/cubejs-questdb-driver/package.json
index cdc338b2e5..9d746adeef 100644
--- a/packages/cubejs-questdb-driver/package.json
+++ b/packages/cubejs-questdb-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/questdb-driver",
   "description": "Cube.js QuestDB database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -27,9 +27,9 @@
     "lint:fix": "eslint --fix src/* --ext .ts"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/schema-compiler": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/schema-compiler": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "@types/pg": "^8.6.0",
     "moment": "^2.24.0",
     "pg": "^8.7.0",
@@ -37,8 +37,8 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/testing-shared": "1.1.17",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/testing-shared": "1.2.14",
     "testcontainers": "^10.10.4",
     "typescript": "~5.2.2"
   },
diff --git a/packages/cubejs-redshift-driver/CHANGELOG.md b/packages/cubejs-redshift-driver/CHANGELOG.md
index 8098fcff6d..48ab768f2b 100644
--- a/packages/cubejs-redshift-driver/CHANGELOG.md
+++ b/packages/cubejs-redshift-driver/CHANGELOG.md
@@ -3,6 +3,70 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/redshift-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/redshift-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/redshift-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/redshift-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+### Bug Fixes
+
+- **redshift-driver:** Fix empty tableColumnTypes for external (Spectrum) tables ([#9251](https://github.com/cube-js/cube/issues/9251)) ([fa318a1](https://github.com/cube-js/cube/commit/fa318a144ed6ef484e2ac101cd71ab6ab6ca7abf))
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/redshift-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/redshift-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/redshift-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/redshift-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/redshift-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+### Features
+
+- **server-core:** Introduce CUBEJS_REFRESH_WORKER_CONCURRENCY env and update default concurrency settings for drivers ([#9168](https://github.com/cube-js/cube/issues/9168)) ([7ef6282](https://github.com/cube-js/cube/commit/7ef628273905d47996b108862a52dde89b9525e3))
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/redshift-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/redshift-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/redshift-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/redshift-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Bug Fixes
diff --git a/packages/cubejs-redshift-driver/package.json b/packages/cubejs-redshift-driver/package.json
index 8a6a98d340..61cea8a5fc 100644
--- a/packages/cubejs-redshift-driver/package.json
+++ b/packages/cubejs-redshift-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/redshift-driver",
   "description": "Cube.js Redshift database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -25,13 +25,13 @@
     "lint:fix": "eslint --fix src/* --ext .ts"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/postgres-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17"
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/postgres-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "typescript": "~5.2.2"
   },
   "publishConfig": {
diff --git a/packages/cubejs-redshift-driver/src/RedshiftDriver.ts b/packages/cubejs-redshift-driver/src/RedshiftDriver.ts
index ecc39bd31e..7cf19a5a61 100644
--- a/packages/cubejs-redshift-driver/src/RedshiftDriver.ts
+++ b/packages/cubejs-redshift-driver/src/RedshiftDriver.ts
@@ -16,6 +16,7 @@ import {
   StreamOptions,
   StreamTableDataWithTypes,
   TableColumn,
+  TableStructure,
   UnloadOptions
 } from '@cubejs-backend/base-driver';
 import crypto from 'crypto';
@@ -57,7 +58,7 @@ export class RedshiftDriver extends PostgresDriver<RedshiftDriverConfiguration>
    * Returns default concurrency value.
    */
   public static getDefaultConcurrency(): number {
-    return 4;
+    return 5;
   }
 
   /**
@@ -341,6 +342,19 @@ export class RedshiftDriver extends PostgresDriver<RedshiftDriverConfiguration>
     // @todo Implement for Redshift, column \"typcategory\" does not exist in pg_type
   }
 
+  public override async tableColumnTypes(table: string): Promise<TableStructure> {
+    const [schema, name] = table.split('.');
+
+    // We might get table from Spectrum schema, so common request via `information_schema.columns`
+    // won't return anything. `getColumnsForSpecificTables` is aware of Spectrum tables.
+    const columns = await this.getColumnsForSpecificTables([{
+      schema_name: schema,
+      table_name: name,
+    }]);
+
+    return columns.map(c => ({ name: c.column_name, type: this.toGenericType(c.data_type) }));
+  }
+
   public async isUnloadSupported() {
     if (this.config.exportBucket) {
       return true;
diff --git a/packages/cubejs-schema-compiler/CHANGELOG.md b/packages/cubejs-schema-compiler/CHANGELOG.md
index 2832351674..00841e7a01 100644
--- a/packages/cubejs-schema-compiler/CHANGELOG.md
+++ b/packages/cubejs-schema-compiler/CHANGELOG.md
@@ -3,6 +3,89 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/schema-compiler
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/schema-compiler
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/schema-compiler
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/schema-compiler
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+### Bug Fixes
+
+- **schema-compiler:** Fix sql generation for rolling_window queries with multiple time dimensions ([#9124](https://github.com/cube-js/cube/issues/9124)) ([52a664e](https://github.com/cube-js/cube/commit/52a664e4d0643d78464f75cc48c4a1f686455ebe))
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+### Bug Fixes
+
+- **schema-compiler:** Fix allowNonStrictDateRangeMatch pre-agg match for dateRange queries without granularities ([#9258](https://github.com/cube-js/cube/issues/9258)) ([00fe682](https://github.com/cube-js/cube/commit/00fe6825418e7ad6681b0856fee11175dfcc649e))
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/schema-compiler
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+### Bug Fixes
+
+- **schema-compiler:** hierarchies to respect prefix value ([#9239](https://github.com/cube-js/cube/issues/9239)) ([19d1b33](https://github.com/cube-js/cube/commit/19d1b33b7df6a98198aadfa25e290fd33b89ad33))
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+### Bug Fixes
+
+- **schema-compiler:** Correct models transpilation in native in multitenant environments ([#9234](https://github.com/cube-js/cube/issues/9234)) ([84f90c0](https://github.com/cube-js/cube/commit/84f90c07ee3827e6f3652dd6c9fab0993ecc8150))
+
+### Features
+
+- **schema-compiler:** Boost models transpilation 10-13x times (using SWC instead of Babel) ([#9225](https://github.com/cube-js/cube/issues/9225)) ([2dd9a4a](https://github.com/cube-js/cube/commit/2dd9a4a5ba0f178e304befc476609fc30ada8975))
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/schema-compiler
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/schema-compiler
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/schema-compiler
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+### Bug Fixes
+
+- **schema-compiler:** Fix queries with time dimensions without granularities don't hit pre-aggregations with allow_non_strict_date_range_match=true ([#9102](https://github.com/cube-js/cube/issues/9102)) ([eff0736](https://github.com/cube-js/cube/commit/eff073629261c687416a92b8876e46a522bdd1d8))
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+### Features
+
+- **schema-compiler:** Move transpiling to worker threads (under the flag) ([#9188](https://github.com/cube-js/cube/issues/9188)) ([7451452](https://github.com/cube-js/cube/commit/745145283b42c891e0e063c4cad1e2102c71616a))
+- **tesseract:** Subqueries support ([#9108](https://github.com/cube-js/cube/issues/9108)) ([0dbf3bb](https://github.com/cube-js/cube/commit/0dbf3bb866b731f97b5588b0e620c3be7cbf9e5b))
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+### Bug Fixes
+
+- **schema-compiler:** make sure view members are resolvable in DAP ([#9059](https://github.com/cube-js/cube/issues/9059)) ([e7b992e](https://github.com/cube-js/cube/commit/e7b992effb6ef90883d059280270c92d903607d4))
+
+### Features
+
+- Support complex join conditions for grouped joins ([#9157](https://github.com/cube-js/cube/issues/9157)) ([28c1e3b](https://github.com/cube-js/cube/commit/28c1e3bba7a100f3152bfdefd86197e818fac941))
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Features
diff --git a/packages/cubejs-schema-compiler/package.json b/packages/cubejs-schema-compiler/package.json
index 16f9e7d62c..7de33c51d4 100644
--- a/packages/cubejs-schema-compiler/package.json
+++ b/packages/cubejs-schema-compiler/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/schema-compiler",
   "description": "Cube schema compiler",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -40,8 +40,8 @@
     "@babel/standalone": "^7.24",
     "@babel/traverse": "^7.24",
     "@babel/types": "^7.24",
-    "@cubejs-backend/native": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/native": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "antlr4ts": "0.5.0-alpha.4",
     "camelcase": "^6.2.0",
     "cron-parser": "^4.9.0",
@@ -54,12 +54,13 @@
     "node-dijkstra": "^2.5.0",
     "ramda": "^0.27.2",
     "syntax-error": "^1.3.0",
-    "uuid": "^8.3.2"
+    "uuid": "^8.3.2",
+    "workerpool": "^9.2.0"
   },
   "devDependencies": {
     "@clickhouse/client": "^1.7.0",
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/query-orchestrator": "1.1.17",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/query-orchestrator": "1.2.14",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__generator": "^7.6.8",
     "@types/babel__traverse": "^7.20.5",
diff --git a/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js b/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
index ee2d408196..b84125abae 100644
--- a/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
+++ b/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
@@ -8,14 +8,21 @@
 
 import R from 'ramda';
 import cronParser from 'cron-parser';
-
 import moment from 'moment-timezone';
 import inflection from 'inflection';
-import { FROM_PARTITION_RANGE, inDbTimeZone, MAX_SOURCE_ROW_LIMIT, QueryAlias, getEnv, timeSeries as timeSeriesBase } from '@cubejs-backend/shared';
 
+import {
+  FROM_PARTITION_RANGE,
+  MAX_SOURCE_ROW_LIMIT,
+  inDbTimeZone,
+  QueryAlias,
+  getEnv,
+  timeSeries as timeSeriesBase
+} from '@cubejs-backend/shared';
 import {
   buildSqlAndParams as nativeBuildSqlAndParams,
 } from '@cubejs-backend/native';
+
 import { UserError } from '../compiler/UserError';
 import { BaseMeasure } from './BaseMeasure';
 import { BaseDimension } from './BaseDimension';
@@ -26,6 +33,7 @@ import { BaseTimeDimension } from './BaseTimeDimension';
 import { ParamAllocator } from './ParamAllocator';
 import { PreAggregations } from './PreAggregations';
 import { SqlParser } from '../parser/SqlParser';
+import { Granularity } from './Granularity';
 
 const DEFAULT_PREAGGREGATIONS_SCHEMA = 'stb_pre_aggregations';
 
@@ -654,7 +662,17 @@ export class BaseQuery {
       ungrouped: this.options.ungrouped
 
     };
-    const res = nativeBuildSqlAndParams(queryParams);
+    const buildResult = nativeBuildSqlAndParams(queryParams);
+
+    if (buildResult.error) {
+      if (buildResult.error.cause && buildResult.error.cause === 'User') {
+        throw new UserError(buildResult.error.message);
+      } else {
+        throw new Error(buildResult.error.message);
+      }
+    }
+
+    const res = buildResult.result;
     // FIXME
     res[1] = [...res[1]];
     return res;
@@ -934,8 +952,8 @@ export class BaseQuery {
           ).concat(multiStageMembers.map(m => `SELECT * FROM ${m.alias}`));
     }
 
-    // Move regular measures to multiplied ones if there're same
-    // cubes to calculate. Most of the times it'll be much faster to
+    // Move regular measures to multiplied ones if there are same
+    // cubes to calculate. Most of the time it'll be much faster to
     // calculate as there will be only single scan per cube.
     if (
       regularMeasures.length &&
@@ -1379,7 +1397,47 @@ export class BaseQuery {
   }
 
   granularityHierarchies() {
-    return R.fromPairs(Object.keys(standardGranularitiesParents).map(k => [k, this.granularityParentHierarchy(k)]));
+    return this.cacheValue(
+      // If time dimension custom granularity in data model is defined without
+      // timezone information they are treated in query timezone.
+      // Because of that it's not possible to correctly precalculate
+      // granularities hierarchies on startup as they are specific for each timezone.
+      ['granularityHierarchies', this.timezone],
+      () => R.reduce(
+        (hierarchies, cube) => R.reduce(
+          (acc, [tdName, td]) => {
+            const dimensionKey = `${cube}.${tdName}`;
+
+            // constructing standard granularities for time dimension
+            const standardEntries = R.fromPairs(
+              R.keys(standardGranularitiesParents).map(gr => [
+                `${dimensionKey}.${gr}`,
+                standardGranularitiesParents[gr],
+              ]),
+            );
+
+            // If we have custom granularities in time dimension
+            const customEntries = td.granularities
+              ? R.fromPairs(
+                R.keys(td.granularities).map(granularityName => {
+                  const grObj = new Granularity(this, { dimension: dimensionKey, granularity: granularityName });
+                  return [
+                    `${dimensionKey}.${granularityName}`,
+                    [granularityName, ...standardGranularitiesParents[grObj.minGranularity()]],
+                  ];
+                }),
+              )
+              : {};
+
+            return { ...acc, ...standardEntries, ...customEntries };
+          },
+          hierarchies,
+          R.toPairs(this.cubeEvaluator.timeDimensionsForCube(cube)),
+        ),
+        {},
+        R.keys(this.cubeEvaluator.evaluatedCubes),
+      ),
+    );
   }
 
   granularityParentHierarchy(granularity) {
@@ -1413,18 +1471,62 @@ export class BaseQuery {
 
   overTimeSeriesQuery(baseQueryFn, cumulativeMeasure, fromRollup) {
     const dateJoinCondition = cumulativeMeasure.dateJoinCondition();
+    const uniqDateJoinCondition = R.uniqBy(djc => djc[0].dimension, dateJoinCondition);
     const cumulativeMeasures = [cumulativeMeasure];
     if (!this.timeDimensions.find(d => d.granularity)) {
-      const filters = this.segments.concat(this.filters).concat(this.dateFromStartToEndConditionSql(dateJoinCondition, fromRollup, false));
+      const filters = this.segments
+        .concat(this.filters)
+        .concat(this.dateFromStartToEndConditionSql(
+          // If the same time dimension is passed more than once, no need to build the same
+          // filter condition again and again. Different granularities don't play role here,
+          // as rollingWindow.granularity is used for filtering.
+          uniqDateJoinCondition,
+          fromRollup,
+          false
+        ));
       return baseQueryFn(cumulativeMeasures, filters, false);
     }
-    const dateSeriesSql = this.timeDimensions.map(d => this.dateSeriesSql(d)).join(', ');
-    const filters = this.segments.concat(this.filters).concat(this.dateFromStartToEndConditionSql(dateJoinCondition, fromRollup, true));
+
+    if (this.timeDimensions.filter(d => !d.dateRange && d.granularity).length > 0) {
+      throw new UserError('Time series queries without dateRange aren\'t supported');
+    }
+
+    // We can't do meaningful query if few time dimensions with different ranges passed,
+    // it won't be possible to join them together without losing some rows.
+    const rangedTimeDimensions = this.timeDimensions.filter(d => d.dateRange && d.granularity);
+    const uniqTimeDimensionWithRanges = R.uniqBy(d => d.dateRange, rangedTimeDimensions);
+    if (uniqTimeDimensionWithRanges.length > 1) {
+      throw new Error('Can\'t build query for time dimensions with different date ranges');
+    }
+
+    // We need to generate time series table for the lowest granularity among all time dimensions
+    const [dateSeriesDimension, dateSeriesGranularity] = this.timeDimensions.filter(d => d.granularity)
+      .reduce(([prevDim, prevGran], d) => {
+        const mg = this.minGranularity(prevGran, d.resolvedGranularity());
+        if (mg === d.resolvedGranularity()) {
+          return [d, mg];
+        }
+        return [prevDim, mg];
+      }, [null, null]);
+
+    const dateSeriesSql = this.dateSeriesSql(dateSeriesDimension);
+
+    // If the same time dimension is passed more than once, no need to build the same
+    // filter condition again and again. Different granularities don't play role here,
+    // as rollingWindow.granularity is used for filtering.
+    const filters = this.segments
+      .concat(this.filters)
+      .concat(this.dateFromStartToEndConditionSql(
+        uniqDateJoinCondition,
+        fromRollup,
+        true
+      ));
     const baseQuery = this.groupedUngroupedSelect(
       () => baseQueryFn(cumulativeMeasures, filters),
       cumulativeMeasure.shouldUngroupForCumulative(),
       !cumulativeMeasure.shouldUngroupForCumulative() && this.minGranularity(
-        cumulativeMeasure.windowGranularity(), this.timeDimensions.find(d => d.granularity).resolvedGranularity()
+        cumulativeMeasure.windowGranularity(),
+        dateSeriesGranularity
       ) || undefined
     );
     const baseQueryAlias = this.cubeAlias('base');
@@ -1444,10 +1546,27 @@ export class BaseQuery {
       dateSeriesSql,
       baseQuery,
       dateJoinConditionSql,
-      baseQueryAlias
+      baseQueryAlias,
+      dateSeriesDimension.granularity,
     );
   }
 
+  overTimeSeriesSelect(cumulativeMeasures, dateSeriesSql, baseQuery, dateJoinConditionSql, baseQueryAlias, dateSeriesGranularity) {
+    const forSelect = this.overTimeSeriesForSelect(cumulativeMeasures, dateSeriesGranularity);
+    return `SELECT ${forSelect} FROM ${dateSeriesSql}` +
+      ` LEFT JOIN (${baseQuery}) ${this.asSyntaxJoin} ${baseQueryAlias} ON ${dateJoinConditionSql}` +
+      this.groupByClause();
+  }
+
+  overTimeSeriesForSelect(cumulativeMeasures, dateSeriesGranularity) {
+    return this.dimensions
+      .map(s => s.cumulativeSelectColumns())
+      .concat(this.timeDimensions.map(d => d.dateSeriesSelectColumn(null, dateSeriesGranularity)))
+      .concat(cumulativeMeasures.map(s => s.cumulativeSelectColumns()))
+      .filter(c => !!c)
+      .join(', ');
+  }
+
   dateFromStartToEndConditionSql(dateJoinCondition, fromRollup, isFromStartToEnd) {
     return dateJoinCondition.map(
       // TODO these weird conversions to be strict typed for big query.
@@ -1472,24 +1591,6 @@ export class BaseQuery {
     );
   }
 
-  overTimeSeriesSelect(cumulativeMeasures, dateSeriesSql, baseQuery, dateJoinConditionSql, baseQueryAlias) {
-    const forSelect = this.overTimeSeriesForSelect(cumulativeMeasures);
-    return `SELECT ${forSelect} FROM ${dateSeriesSql}` +
-      ` LEFT JOIN (${baseQuery}) ${this.asSyntaxJoin} ${baseQueryAlias} ON ${dateJoinConditionSql}` +
-      this.groupByClause();
-  }
-
-  overTimeSeriesForSelect(cumulativeMeasures) {
-    return this.dimensions.map(s => s.cumulativeSelectColumns()).concat(this.dateSeriesSelect()).concat(
-      cumulativeMeasures.map(s => s.cumulativeSelectColumns()),
-    ).filter(c => !!c)
-      .join(', ');
-  }
-
-  dateSeriesSelect() {
-    return this.timeDimensions.map(d => d.dateSeriesSelectColumn());
-  }
-
   /**
    * @param {import('./BaseTimeDimension').BaseTimeDimension} timeDimension
    * @return {string}
@@ -1646,7 +1747,8 @@ export class BaseQuery {
 
   /**
    *
-   * @param {{sql: string, on: {cubeName: string, expression: Function}, joinType: 'LEFT' | 'INNER', alias: string}} customJoin
+   * @param {{sql: string, on: {cubeName: string, expression: Function}, joinType: 'LEFT' | 'INNER', alias: string}}
+   *   customJoin
    * @returns {JoinItem}
    */
   customSubQueryJoin(customJoin) {
@@ -3332,6 +3434,7 @@ export class BaseQuery {
         sort: '{{ expr }} {% if asc %}ASC{% else %}DESC{% endif %} NULLS {% if nulls_first %}FIRST{% else %}LAST{% endif %}',
         order_by: '{% if index %} {{ index }} {% else %} {{ expr }} {% endif %} {% if asc %}ASC{% else %}DESC{% endif %}{% if nulls_first %} NULLS FIRST{% endif %}',
         cast: 'CAST({{ expr }} AS {{ data_type }})',
+        cast_to_string: 'CAST({{ expr }} AS TEXT)',
         window_function: '{{ fun_call }} OVER ({% if partition_by_concat %}PARTITION BY {{ partition_by_concat }}{% if order_by_concat or window_frame %} {% endif %}{% endif %}{% if order_by_concat %}ORDER BY {{ order_by_concat }}{% if window_frame %} {% endif %}{% endif %}{% if window_frame %}{{ window_frame }}{% endif %})',
         window_frame_bounds: '{{ frame_type }} BETWEEN {{ frame_start }} AND {{ frame_end }}',
         in_list: '{{ expr }} {% if negated %}NOT {% endif %}IN ({{ in_exprs_concat }})',
@@ -3348,6 +3451,7 @@ export class BaseQuery {
         like: '{{ expr }} {% if negated %}NOT {% endif %}LIKE {{ pattern }}',
         ilike: '{{ expr }} {% if negated %}NOT {% endif %}ILIKE {{ pattern }}',
         like_escape: '{{ like_expr }} ESCAPE {{ escape_char }}',
+        concat_strings: '{{ strings | join(\' || \' ) }}',
       },
       filters: {
         equals: '{{ column }} = {{ value }}{{ is_null_check }}',
@@ -3803,6 +3907,12 @@ export class BaseQuery {
     return this.contextSymbolsProxy(this.contextSymbols.securityContext);
   }
 
+  sqlUtilsForRust() {
+    return {
+      convertTz: this.convertTz.bind(this)
+    };
+  }
+
   contextSymbolsProxy(symbols) {
     return BaseQuery.contextSymbolsProxyFrom(symbols, this.paramAllocator.allocateParam.bind(this.paramAllocator));
   }
diff --git a/packages/cubejs-schema-compiler/src/adapter/BaseTimeDimension.ts b/packages/cubejs-schema-compiler/src/adapter/BaseTimeDimension.ts
index c5305250c0..e84a81c47d 100644
--- a/packages/cubejs-schema-compiler/src/adapter/BaseTimeDimension.ts
+++ b/packages/cubejs-schema-compiler/src/adapter/BaseTimeDimension.ts
@@ -39,7 +39,7 @@ export class BaseTimeDimension extends BaseFilter {
   }
 
   // TODO: find and fix all hidden references to granularity to rely on granularityObj instead?
-  public get granularity(): string | undefined {
+  public get granularity(): string | null | undefined {
     return this.granularityObj?.granularity;
   }
 
@@ -85,10 +85,18 @@ export class BaseTimeDimension extends BaseFilter {
     return this.query.escapeColumnName(`${this.dimension}_series`);
   }
 
-  public dateSeriesSelectColumn(dateSeriesAliasName) {
+  public dateSeriesSelectColumn(dateSeriesAliasName: string | null, dateSeriesGranularity?: string) {
     if (!this.granularityObj) {
       return null;
     }
+
+    // In case of query with more than one granularity, the time series table was generated
+    // with the minimal granularity among all. If this is our granularity, we can save
+    // some cpu cycles without 'date_from' truncation. But if this is not our granularity,
+    // we need to truncate it to desired.
+    if (dateSeriesGranularity && this.granularityObj?.granularity !== dateSeriesGranularity) {
+      return `${this.query.dimensionTimeGroupedColumn(`${dateSeriesAliasName || this.dateSeriesAliasName()}.${this.query.escapeColumnName('date_from')}`, this.granularityObj)} ${this.aliasName()}`;
+    }
     return `${dateSeriesAliasName || this.dateSeriesAliasName()}.${this.query.escapeColumnName('date_from')} ${this.aliasName()}`;
   }
 
@@ -217,7 +225,7 @@ export class BaseTimeDimension extends BaseFilter {
     return this.query.dateTimeCast(this.query.paramAllocator.allocateParam(this.dateRange ? this.dateToFormatted() : BUILD_RANGE_END_LOCAL));
   }
 
-  public dateRangeGranularity() {
+  public dateRangeGranularity(): string | null {
     if (!this.dateRange) {
       return null;
     }
@@ -229,9 +237,9 @@ export class BaseTimeDimension extends BaseFilter {
     );
   }
 
-  protected rollupGranularityValue: any | null = null;
+  protected rollupGranularityValue: string | null = null;
 
-  public rollupGranularity() {
+  public rollupGranularity(): string | null {
     if (!this.rollupGranularityValue) {
       this.rollupGranularityValue =
         this.query.cacheValue(
@@ -241,7 +249,18 @@ export class BaseTimeDimension extends BaseFilter {
               return this.dateRangeGranularity();
             }
 
-            return this.query.minGranularity(this.granularityObj.minGranularity(), this.dateRangeGranularity());
+            if (!this.dateRange) {
+              return this.granularityObj.minGranularity();
+            }
+
+            // If we have granularity and date range, we need to check
+            // that the interval and the granularity offset are stacked/fits with date range
+            if (this.granularityObj.isPredefined() ||
+              !this.granularityObj.isAlignedWithDateRange([this.dateFromFormatted(), this.dateToFormatted()])) {
+              return this.query.minGranularity(this.granularityObj.minGranularity(), this.dateRangeGranularity());
+            }
+
+            return this.granularityObj.granularity;
           }
         );
     }
@@ -262,11 +281,7 @@ export class BaseTimeDimension extends BaseFilter {
   }
 
   public resolvedGranularity() {
-    return this.granularityObj?.resolvedGranularity();
-  }
-
-  public isPredefinedGranularity(): boolean {
-    return this.granularityObj?.isPredefined() || false;
+    return this.granularityObj ? this.granularityObj.resolvedGranularity() : null;
   }
 
   public wildcardRange() {
diff --git a/packages/cubejs-schema-compiler/src/adapter/Granularity.ts b/packages/cubejs-schema-compiler/src/adapter/Granularity.ts
index ff595a5261..d635bd3c6b 100644
--- a/packages/cubejs-schema-compiler/src/adapter/Granularity.ts
+++ b/packages/cubejs-schema-compiler/src/adapter/Granularity.ts
@@ -1,8 +1,12 @@
 import moment from 'moment-timezone';
 import {
   addInterval,
-  isPredefinedGranularity, parseSqlInterval,
-  QueryDateRange, timeSeries,
+  alignToOrigin,
+  isPredefinedGranularity,
+  parsedSqlIntervalToDuration,
+  parseSqlInterval,
+  QueryDateRange,
+  timeSeries,
   timeSeriesFromCustomInterval,
   TimeSeriesOptions
 } from '@cubejs-backend/shared';
@@ -159,6 +163,29 @@ export class Granularity {
     }
   }
 
+  public isAlignedWithDateRange([startStr, endStr]: QueryDateRange): boolean {
+    const intervalParsed = parseSqlInterval(this.granularityInterval);
+    const grIntervalDuration = parsedSqlIntervalToDuration(intervalParsed);
+    const msFrom = moment.tz(startStr, this.queryTimezone);
+    const msTo = moment.tz(endStr, this.queryTimezone).add(1, 'ms');
+
+    // We can't simply compare interval milliseconds because of DSTs.
+    const testDate = msFrom.clone();
+    while (testDate.isBefore(msTo)) {
+      testDate.add(grIntervalDuration);
+    }
+    if (!testDate.isSame(msTo)) {
+      return false;
+    }
+
+    const closestDate = alignToOrigin(msFrom, intervalParsed, this.origin);
+    if (!msFrom.isSame(closestDate)) {
+      return false;
+    }
+
+    return true;
+  }
+
   public isNaturalAligned(): boolean {
     const intParsed = this.granularityInterval.split(' ');
 
diff --git a/packages/cubejs-schema-compiler/src/adapter/PreAggregations.js b/packages/cubejs-schema-compiler/src/adapter/PreAggregations.js
index efc642af9d..c23cfd418f 100644
--- a/packages/cubejs-schema-compiler/src/adapter/PreAggregations.js
+++ b/packages/cubejs-schema-compiler/src/adapter/PreAggregations.js
@@ -439,18 +439,14 @@ export class PreAggregations {
   static sortTimeDimensionsWithRollupGranularity(timeDimensions) {
     return timeDimensions && R.sortBy(
       R.prop(0),
-      timeDimensions.map(d => (d.isPredefinedGranularity() ?
-        [d.expressionPath(), d.rollupGranularity(), null] :
-        // For custom granularities we need to add its name to the list (for exact matches)
-        [d.expressionPath(), d.rollupGranularity(), d.granularity]
-      ))
+      timeDimensions.map(d => [d.expressionPath(), d.rollupGranularity()])
     ) || [];
   }
 
   static timeDimensionsAsIs(timeDimensions) {
     return timeDimensions && R.sortBy(
       R.prop(0),
-      timeDimensions.map(d => [d.expressionPath(), d.granularity]),
+      timeDimensions.map(d => [d.expressionPath(), d.resolvedGranularity()]),
     ) || [];
   }
 
@@ -485,26 +481,6 @@ export class PreAggregations {
     );
   }
 
-  canUsePreAggregationAndCheckIfRefValid(query) {
-    const transformedQuery = PreAggregations.transformQueryToCanUseForm(query);
-    return (refs) => PreAggregations.canUsePreAggregationForTransformedQueryFn(
-      transformedQuery, refs
-    );
-  }
-
-  checkAutoRollupPreAggregationValid(refs) {
-    try {
-      this.autoRollupPreAggregationQuery(null, refs); // TODO null
-      return true;
-    } catch (e) {
-      if (e instanceof UserError || e.toString().indexOf('ReferenceError') !== -1) {
-        return false;
-      } else {
-        throw e;
-      }
-    }
-  }
-
   /**
    * Returns function to determine whether pre-aggregation can be used or not
    * for specified query, or its value for `refs` if specified.
@@ -560,9 +536,7 @@ export class PreAggregations {
         backAlias(references.sortedTimeDimensions || sortTimeDimensions(references.timeDimensions));
       const qryTimeDimensions = references.allowNonStrictDateRangeMatch
         ? transformedQuery.timeDimensions
-        : transformedQuery.sortedTimeDimensions.map(t => t.slice(0, 2));
-      // slice above is used to exclude possible custom granularity returned from sortTimeDimensionsWithRollupGranularity()
-
+        : transformedQuery.sortedTimeDimensions;
       const backAliasMeasures = backAlias(references.measures);
       const backAliasSortedDimensions = backAlias(references.sortedDimensions || references.dimensions);
       const backAliasDimensions = backAlias(references.dimensions);
@@ -589,12 +563,13 @@ export class PreAggregations {
     };
 
     /**
-     * Wrap granularity string into an array.
-     * @param {string} granularity
+     * Expand granularity into array of granularity hierarchy.
+     * @param {string} dimension Dimension in the form of `cube.timeDimension`
+     * @param {string} granularity Granularity
      * @returns {Array<string>}
      */
-    const expandGranularity = (granularity) => (
-      transformedQuery.granularityHierarchies[granularity] ||
+    const expandGranularity = (dimension, granularity) => (
+      transformedQuery.granularityHierarchies[`${dimension}.${granularity}`] ||
       [granularity]
     );
 
@@ -611,15 +586,15 @@ export class PreAggregations {
         references.sortedTimeDimensions ||
         sortTimeDimensions(references.timeDimensions);
 
-      return expandGranularity(transformedQuery.windowGranularity)
-        .map(
-          windowGranularity => R.all(
-            td => td[1] === windowGranularity,
-            sortedTimeDimensions,
+      return sortedTimeDimensions
+        .map(td => expandGranularity(td[0], transformedQuery.windowGranularity))
+        .some(
+          expandedGranularities => expandedGranularities.some(
+            windowGranularity => sortedTimeDimensions.every(
+              td => td[1] === windowGranularity
+            )
           )
-        )
-        .filter(x => !!x)
-        .length > 0;
+        );
     };
 
     /**
@@ -628,16 +603,12 @@ export class PreAggregations {
      * @returns {Array<Array<string>>}
      */
     const expandTimeDimension = (timeDimension) => {
-      const [dimension, granularity, customGranularity] = timeDimension;
-      const res = expandGranularity(granularity)
-        .map((newGranularity) => [dimension, newGranularity]);
-
-      if (customGranularity) {
-        // For custom granularities we add it upfront to the list (for exact matches)
-        res.unshift([dimension, customGranularity]);
+      const [dimension, resolvedGranularity] = timeDimension;
+      if (!resolvedGranularity) {
+        return [[dimension, '*']]; // Any granularity should fit
       }
-
-      return res;
+      return expandGranularity(dimension, resolvedGranularity)
+        .map((newGranularity) => [dimension, newGranularity]);
     };
 
     /**
@@ -670,7 +641,13 @@ export class PreAggregations {
 
       const timeDimensionsMatch = (timeDimensionsList, doBackAlias) => R.allPass(
         timeDimensionsList.map(
-          tds => R.anyPass(tds.map(td => R.contains(td)))
+          tds => R.anyPass(tds.map(td => {
+            if (td[1] === '*') {
+              return R.any(tdtc => tdtc[0] === td[0]); // need to match the dimension at least
+            } else {
+              return R.contains(td);
+            }
+          }))
         )
       )(
         doBackAlias ?
diff --git a/packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.ts b/packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.ts
index b5bf5bbb29..abcc94ad60 100644
--- a/packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.ts
+++ b/packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.ts
@@ -238,6 +238,11 @@ export class CubeEvaluator extends CubeSymbols {
     if (cube.isView && (cube.includedMembers || []).length) {
       const includedMemberPaths: string[] = R.uniq(cube.includedMembers.map(it => it.memberPath));
       const includedCubeNames: string[] = R.uniq(includedMemberPaths.map(it => it.split('.')[0]));
+      // Path to name (which can be prefixed or aliased) map for hierarchy
+      const hierarchyPathToName = cube.includedMembers.filter(it => it.type === 'hierarchies').reduce((acc, it) => ({
+        ...acc,
+        [it.memberPath]: it.name
+      }), {});
       const includedHierarchyNames = cube.includedMembers.filter(it => it.type === 'hierarchies').map(it => it.memberPath.split('.')[1]);
 
       for (const cubeName of includedCubeNames) {
@@ -258,10 +263,16 @@ export class CubeEvaluator extends CubeSymbols {
                 }
 
                 return null;
-              }).filter(Boolean);
+              })
+                .filter(Boolean);
 
+              const name = hierarchyPathToName[[cubeName, it.name].join('.')];
+              if (!name) {
+                throw new UserError(`Hierarchy '${it.name}' not found in cube '${cubeName}'`);
+              }
               return {
                 ...it,
+                name,
                 levels
               };
             })
@@ -448,8 +459,8 @@ export class CubeEvaluator extends CubeSymbols {
 
   public timeDimensionPathsForCube(cube: any) {
     return R.compose(
-      R.map(nameToDefinition => `${cube}.${nameToDefinition[0]}`),
-      R.toPairs,
+      R.map(dimName => `${cube}.${dimName}`),
+      R.keys,
       // @ts-ignore
       R.filter((d: any) => d.type === 'time')
       // @ts-ignore
@@ -460,12 +471,19 @@ export class CubeEvaluator extends CubeSymbols {
     return this.cubeFromPath(cube).measures || {};
   }
 
+  public timeDimensionsForCube(cube) {
+    return R.filter(
+      (d: any) => d.type === 'time',
+      this.cubeFromPath(cube).dimensions || {}
+    );
+  }
+
   public preAggregationsForCube(path: string) {
     return this.cubeFromPath(path).preAggregations || {};
   }
 
   /**
-   * Returns pre-aggregations filtered by the spcified selector.
+   * Returns pre-aggregations filtered by the specified selector.
    * @param {{
    *  scheduled: boolean,
    *  dataSource: Array<string>,
diff --git a/packages/cubejs-schema-compiler/src/compiler/CubeSymbols.js b/packages/cubejs-schema-compiler/src/compiler/CubeSymbols.ts
similarity index 78%
rename from packages/cubejs-schema-compiler/src/compiler/CubeSymbols.js
rename to packages/cubejs-schema-compiler/src/compiler/CubeSymbols.ts
index e8c59a8fb2..fec0159c8c 100644
--- a/packages/cubejs-schema-compiler/src/compiler/CubeSymbols.js
+++ b/packages/cubejs-schema-compiler/src/compiler/CubeSymbols.ts
@@ -7,8 +7,32 @@ import { DynamicReference } from './DynamicReference';
 import { camelizeCube } from './utils';
 import { BaseQuery } from '../adapter';
 
+import type { ErrorReporter } from './ErrorReporter';
+
+interface CubeDefinition {
+  name: string;
+  extends?: string;
+  measures?: Record<string, any>;
+  dimensions?: Record<string, any>;
+  segments?: Record<string, any>;
+  hierarchies?: Record<string, any>;
+  preAggregations?: Record<string, any>;
+  joins?: Record<string, any>;
+  accessPolicy?: Record<string, any>;
+  includes?: any;
+  excludes?: any;
+  cubes?: any;
+  isView?: boolean;
+  isSplitView?: boolean;
+  includedMembers?: any[];
+}
+
+interface SplitViews {
+  [key: string]: any;
+}
+
 const FunctionRegex = /function\s+\w+\(([A-Za-z0-9_,]*)|\(([\s\S]*?)\)\s*=>|\(?(\w+)\)?\s*=>/;
-const CONTEXT_SYMBOLS = {
+export const CONTEXT_SYMBOLS = {
   SECURITY_CONTEXT: 'securityContext',
   // SECURITY_CONTEXT has been deprecated, however security_context (lowecase)
   // is allowed in RBAC policies for query-time attribute matching
@@ -19,30 +43,47 @@ const CONTEXT_SYMBOLS = {
   SQL_UTILS: 'sqlUtils'
 };
 
-const CURRENT_CUBE_CONSTANTS = ['CUBE', 'TABLE'];
+export const CURRENT_CUBE_CONSTANTS = ['CUBE', 'TABLE'];
 
 export class CubeSymbols {
-  constructor(evaluateViews) {
+  public symbols: Record<string | symbol, any>;
+
+  private builtCubes: Record<string, any>;
+
+  private cubeDefinitions: Record<string, CubeDefinition>;
+
+  private funcArgumentsValues: Record<string, string[]>;
+
+  public cubeList: any[];
+
+  private evaluateViews: boolean;
+
+  private resolveSymbolsCallContext: any;
+
+  public constructor(evaluateViews = false) {
     this.symbols = {};
     this.builtCubes = {};
     this.cubeDefinitions = {};
     this.funcArgumentsValues = {};
     this.cubeList = [];
-    this.evaluateViews = evaluateViews || false;
+    this.evaluateViews = evaluateViews;
   }
 
-  compile(cubes, errorReporter) {
+  public compile(cubes: CubeDefinition[], errorReporter: ErrorReporter) {
+    // @ts-ignore
     this.cubeDefinitions = R.pipe(
-      R.map(c => [c.name, c]),
+      // @ts-ignore
+      R.map((c: CubeDefinition) => [c.name, c]),
       R.fromPairs
+      // @ts-ignore
     )(cubes);
     this.cubeList = cubes.map(c => (c.name ? this.getCubeDefinition(c.name) : this.createCube(c)));
     // TODO support actual dependency sorting to allow using views inside views
     const sortedByDependency = R.pipe(
-      R.sortBy(c => !!c.isView),
+      R.sortBy((c: CubeDefinition) => !!c.isView),
     )(cubes);
     for (const cube of sortedByDependency) {
-      const splitViews = {};
+      const splitViews: SplitViews = {};
       this.symbols[cube.name] = this.transform(cube.name, errorReporter.inContext(`${cube.name} cube`), splitViews);
       for (const viewName of Object.keys(splitViews)) {
         // TODO can we define it when cubeList is defined?
@@ -52,7 +93,7 @@ export class CubeSymbols {
     }
   }
 
-  getCubeDefinition(cubeName) {
+  public getCubeDefinition(cubeName: string) {
     if (!this.builtCubes[cubeName]) {
       const cubeDefinition = this.cubeDefinitions[cubeName];
       this.builtCubes[cubeName] = this.createCube(cubeDefinition);
@@ -61,14 +102,14 @@ export class CubeSymbols {
     return this.builtCubes[cubeName];
   }
 
-  createCube(cubeDefinition) {
-    let measures;
-    let dimensions;
-    let segments;
-    let hierarchies;
+  public createCube(cubeDefinition: CubeDefinition) {
+    let measures: any;
+    let dimensions: any;
+    let segments: any;
+    let hierarchies: any;
 
     const cubeObject = Object.assign({
-      allDefinitions(type) {
+      allDefinitions(type: string) {
         if (cubeDefinition.extends) {
           return {
             ...super.allDefinitions(type),
@@ -121,7 +162,7 @@ export class CubeSymbols {
     cubeDefinition);
 
     if (cubeDefinition.extends) {
-      const superCube = this.resolveSymbolsCall(cubeDefinition.extends, (name) => this.cubeReferenceProxy(name));
+      const superCube = this.resolveSymbolsCall(cubeDefinition.extends, (name: string) => this.cubeReferenceProxy(name));
       Object.setPrototypeOf(
         cubeObject,
         // eslint-disable-next-line no-underscore-dangle
@@ -132,19 +173,23 @@ export class CubeSymbols {
     return cubeObject;
   }
 
-  transform(cubeName, errorReporter, splitViews) {
+  protected transform(cubeName: string, errorReporter: ErrorReporter, splitViews: SplitViews) {
     const cube = this.getCubeDefinition(cubeName);
     const duplicateNames = R.compose(
-      R.map(nameToDefinitions => nameToDefinitions[0]),
+      R.map((nameToDefinitions: any) => nameToDefinitions[0]),
       R.toPairs,
-      R.filter(definitionsByName => definitionsByName.length > 1),
-      R.groupBy(nameToDefinition => nameToDefinition[0]),
+      R.filter((definitionsByName: any) => definitionsByName.length > 1),
+      R.groupBy((nameToDefinition: any) => nameToDefinition[0]),
       R.unnest,
       R.map(R.toPairs),
-      R.filter(v => !!v)
+      // @ts-ignore
+      R.filter((v: any) => !!v)
+      // @ts-ignore
     )([cube.measures, cube.dimensions, cube.segments, cube.preAggregations, cube.hierarchies]);
 
+    // @ts-ignore
     if (duplicateNames.length > 0) {
+      // @ts-ignore
       errorReporter.error(`${duplicateNames.join(', ')} defined more than once`);
     }
 
@@ -174,10 +219,7 @@ export class CubeSymbols {
     );
   }
 
-  /**
-   * @private
-   */
-  camelCaseTypes(obj) {
+  private camelCaseTypes(obj: Object) {
     if (!obj) {
       return;
     }
@@ -193,7 +235,7 @@ export class CubeSymbols {
     }
   }
 
-  transformPreAggregations(preAggregations) {
+  protected transformPreAggregations(preAggregations: Object) {
     // eslint-disable-next-line no-restricted-syntax
     for (const preAggregation of Object.values(preAggregations)) {
       // We don't want to set the defaults for the empty pre-aggs because
@@ -222,7 +264,7 @@ export class CubeSymbols {
     }
   }
 
-  transformPreAggregationIndexes(indexes) {
+  protected transformPreAggregationIndexes(indexes: Object) {
     for (const index of Object.values(indexes)) {
       if (!index.type) {
         index.type = 'regular';
@@ -230,23 +272,49 @@ export class CubeSymbols {
     }
   }
 
-  /**
-   * @protected
-   */
-  prepareIncludes(cube, errorReporter, splitViews) {
+  protected prepareIncludes(cube: CubeDefinition, errorReporter: ErrorReporter, splitViews: SplitViews) {
     if (!cube.includes && !cube.cubes) {
       return;
     }
 
     const memberSets = {
-      resolvedMembers: new Set(),
-      allMembers: new Set(),
+      resolvedMembers: new Set<string>(),
+      allMembers: new Set<string>(),
     };
 
-    const types = ['measures', 'dimensions', 'segments', 'hierarchies'];
+    const autoIncludeMembers = new Set<string>();
+    // `hierarchies` must be processed first
+    const types = ['hierarchies', 'measures', 'dimensions', 'segments'];
+
     for (const type of types) {
-      const cubeIncludes = cube.cubes && this.membersFromCubes(cube, cube.cubes, type, errorReporter, splitViews, memberSets) || [];
+      let cubeIncludes: any[] = [];
+      if (cube.cubes) {
+        // If the hierarchy is included all members from it should be included as well
+        // Extend `includes` with members from hierarchies that should be auto-included
+        const cubes = type === 'dimensions' ? cube.cubes.map((it) => {
+          const fullPath = this.evaluateReferences(null, it.joinPath, { collectJoinHints: true });
+          const split = fullPath.split('.');
+          const cubeRef = split[split.length - 1];
+
+          if (it.includes === '*') {
+            return it;
+          }
+
+          const currentCubeAutoIncludeMembers = Array.from(autoIncludeMembers)
+            .filter((path) => path.startsWith(`${cubeRef}.`))
+            .map((path) => path.split('.')[1])
+            .filter(memberName => !it.includes.find((include) => (include.name || include) === memberName));
+
+          return {
+            ...it,
+            includes: (it.includes || []).concat(currentCubeAutoIncludeMembers),
+          };
+        }) : cube.cubes;
 
+        cubeIncludes = this.membersFromCubes(cube, cubes, type, errorReporter, splitViews, memberSets) || [];
+      }
+
+      // This is the deprecated approach
       const includes = cube.includes && this.membersFromIncludeExclude(cube.includes, cube.name, type) || [];
       const excludes = cube.excludes && this.membersFromIncludeExclude(cube.excludes, cube.name, type) || [];
 
@@ -256,10 +324,25 @@ export class CubeSymbols {
         excludes
       );
 
+      if (type === 'hierarchies') {
+        for (const member of finalIncludes) {
+          const path = member.member.split('.');
+          const cubeName = path[path.length - 2];
+          const hierarchyName = path[path.length - 1];
+          const hierarchy = this.getResolvedMember(type, cubeName, hierarchyName);
+
+          if (hierarchy) {
+            const levels = this.evaluateReferences(cubeName, this.getResolvedMember('hierarchies', cubeName, hierarchyName).levels, { originalSorting: true });
+
+            levels.forEach((level) => autoIncludeMembers.add(level));
+          }
+        }
+      }
+
       const includeMembers = this.generateIncludeMembers(finalIncludes, cube.name, type);
       this.applyIncludeMembers(includeMembers, cube, type, errorReporter);
 
-      cube.includedMembers = [...(cube.includedMembers || []), ...Array.from(new Set(finalIncludes.map((it) => {
+      cube.includedMembers = [...(cube.includedMembers || []), ...Array.from(new Set(finalIncludes.map((it: any) => {
         const split = it.member.split('.');
         const memberPath = this.pathFromArray([split[split.length - 2], split[split.length - 1]]);
         return {
@@ -275,20 +358,17 @@ export class CubeSymbols {
     });
   }
 
-  applyIncludeMembers(includeMembers, cube, type, errorReporter) {
+  protected applyIncludeMembers(includeMembers: any[], cube: CubeDefinition, type: string, errorReporter: ErrorReporter) {
     for (const [memberName, memberDefinition] of includeMembers) {
       if (cube[type]?.[memberName]) {
-        errorReporter.error(`Included member '${memberName}' conflicts with existing member of '${cube.name}'. Please consider excluding this member.`);
+        errorReporter.error(`Included member '${memberName}' conflicts with existing member of '${cube.name}'. Please consider excluding this member or assigning it an alias.`);
       } else if (type !== 'hierarchies') {
         cube[type][memberName] = memberDefinition;
       }
     }
   }
 
-  /**
-   * @protected
-   */
-  membersFromCubes(parentCube, cubes, type, errorReporter, splitViews, memberSets) {
+  protected membersFromCubes(parentCube: CubeDefinition, cubes: any[], type: string, errorReporter: ErrorReporter, splitViews: SplitViews, memberSets: any) {
     return R.unnest(cubes.map(cubeInclude => {
       const fullPath = this.evaluateReferences(null, cubeInclude.joinPath, { collectJoinHints: true });
       const split = fullPath.split('.');
@@ -296,17 +376,13 @@ export class CubeSymbols {
       const cubeName = cubeInclude.alias || cubeReference;
 
       let includes;
-      const fullMemberName = (memberName) => (cubeInclude.prefix ? `${cubeName}_${memberName}` : memberName);
+      const fullMemberName = (memberName: string) => (cubeInclude.prefix ? `${cubeName}_${memberName}` : memberName);
 
       if (cubeInclude.includes === '*') {
         const membersObj = this.symbols[cubeReference]?.cubeObj()?.[type] || {};
-        if (Array.isArray(membersObj)) {
-          includes = membersObj.map(it => ({ member: `${fullPath}.${it.name}`, name: fullMemberName(it.name) }));
-        } else {
-          includes = Object.keys(membersObj).map(memberName => ({ member: `${fullPath}.${memberName}`, name: fullMemberName(memberName) }));
-        }
+        includes = Object.keys(membersObj).map(memberName => ({ member: `${fullPath}.${memberName}`, name: fullMemberName(memberName) }));
       } else {
-        includes = cubeInclude.includes.map(include => {
+        includes = cubeInclude.includes.map((include: any) => {
           const member = include.alias || include;
 
           if (member.includes('.')) {
@@ -331,7 +407,7 @@ export class CubeSymbols {
         });
       }
 
-      const excludes = (cubeInclude.excludes || []).map(exclude => {
+      const excludes = (cubeInclude.excludes || []).map((exclude: any) => {
         if (exclude.includes('.')) {
           errorReporter.error(`Paths aren't allowed in cube excludes but '${exclude}' provided as exclude member`);
         }
@@ -367,7 +443,7 @@ export class CubeSymbols {
     }));
   }
 
-  diffByMember(includes, excludes) {
+  protected diffByMember(includes: any[], excludes: any[]) {
     const excludesMap = new Map();
 
     for (const exclude of excludes) {
@@ -377,9 +453,9 @@ export class CubeSymbols {
     return includes.filter(include => !excludesMap.has(include.member));
   }
 
-  membersFromIncludeExclude(referencesFn, cubeName, type) {
+  protected membersFromIncludeExclude(referencesFn: any, cubeName: string, type: string) {
     const references = this.evaluateReferences(cubeName, referencesFn);
-    return R.unnest(references.map(ref => {
+    return R.unnest(references.map((ref: string) => {
       const path = ref.split('.');
       if (path.length === 1) {
         const membersObj = this.symbols[path[0]]?.cubeObj()?.[type] || {};
@@ -393,21 +469,11 @@ export class CubeSymbols {
     })).filter(Boolean);
   }
 
-  /**
-   * @protected
-   */
-  getResolvedMember(type, cubeName, memberName) {
-    if (Array.isArray(this.symbols[cubeName]?.cubeObj()?.[type])) {
-      return this.symbols[cubeName]?.cubeObj()?.[type]?.find((it) => it.name === memberName);
-    }
-
+  protected getResolvedMember(type: string, cubeName: string, memberName: string) {
     return this.symbols[cubeName]?.cubeObj()?.[type]?.[memberName];
   }
 
-  /**
-   * @protected
-   */
-  generateIncludeMembers(members, cubeName, type) {
+  protected generateIncludeMembers(members: any[], cubeName: string, type: string) {
     return members.map(memberRef => {
       const path = memberRef.member.split('.');
       const resolvedMember = this.getResolvedMember(type, path[path.length - 2], path[path.length - 1]);
@@ -464,10 +530,10 @@ export class CubeSymbols {
    * resolveSymbolsCall are sync. Async support may be added later with deeper
    * refactoring.
    */
-  evaluateContextFunction(cube, contextFn, context = {}) {
+  protected evaluateContextFunction(cube: any, contextFn: any, context: any = {}) {
     const cubeEvaluator = this;
 
-    const res = cubeEvaluator.resolveSymbolsCall(contextFn, (name) => {
+    const res = cubeEvaluator.resolveSymbolsCall(contextFn, (name: string) => {
       const resolvedSymbol = this.resolveSymbol(cube, name);
       if (resolvedSymbol) {
         return resolvedSymbol;
@@ -484,7 +550,7 @@ export class CubeSymbols {
     return res;
   }
 
-  evaluateReferences(cube, referencesFn, options = {}) {
+  protected evaluateReferences(cube, referencesFn, options: any = {}) {
     const cubeEvaluator = this;
 
     const fullPath = (joinHints, path) => {
@@ -510,9 +576,9 @@ export class CubeSymbols {
       return cubeEvaluator.pathFromArray(fullPath(cubeEvaluator.joinHints(), [referencedCube, name]));
     }, {
       // eslint-disable-next-line no-shadow
-      sqlResolveFn: (symbol, cube, n) => cubeEvaluator.pathFromArray(fullPath(cubeEvaluator.joinHints(), [cube, n])),
+      sqlResolveFn: (symbol, currentCube, n) => cubeEvaluator.pathFromArray(fullPath(cubeEvaluator.joinHints(), [currentCube, n])),
       // eslint-disable-next-line no-shadow
-      cubeAliasFn: (cube) => cubeEvaluator.pathFromArray(fullPath(cubeEvaluator.joinHints(), [cube])),
+      cubeAliasFn: (currentCube) => cubeEvaluator.pathFromArray(fullPath(cubeEvaluator.joinHints(), [currentCube])),
       collectJoinHints: options.collectJoinHints,
     });
     if (!Array.isArray(arrayOrSingle)) {
@@ -523,11 +589,11 @@ export class CubeSymbols {
     return options.originalSorting ? references : R.sortBy(R.identity, references);
   }
 
-  pathFromArray(array) {
+  public pathFromArray(array) {
     return array.join('.');
   }
 
-  resolveSymbolsCall(func, nameResolver, context) {
+  protected resolveSymbolsCall(func, nameResolver, context?: any) {
     const oldContext = this.resolveSymbolsCallContext;
     this.resolveSymbolsCallContext = context;
     try {
@@ -542,7 +608,7 @@ export class CubeSymbols {
     }
   }
 
-  withSymbolsCallContext(func, context) {
+  protected withSymbolsCallContext(func, context) {
     const oldContext = this.resolveSymbolsCallContext;
     this.resolveSymbolsCallContext = context;
     try {
@@ -552,7 +618,7 @@ export class CubeSymbols {
     }
   }
 
-  funcArguments(func) {
+  protected funcArguments(func) {
     const funcDefinition = func.toString();
     if (!this.funcArgumentsValues[funcDefinition]) {
       const match = funcDefinition.match(FunctionRegex);
@@ -567,12 +633,12 @@ export class CubeSymbols {
     return this.funcArgumentsValues[funcDefinition];
   }
 
-  joinHints() {
+  protected joinHints() {
     const { joinHints } = this.resolveSymbolsCallContext || {};
     return joinHints;
   }
 
-  resolveSymbolsCallDeps(cubeName, sql) {
+  protected resolveSymbolsCallDeps(cubeName, sql) {
     try {
       return this.resolveSymbolsCallDeps2(cubeName, sql);
     } catch (e) {
@@ -581,8 +647,8 @@ export class CubeSymbols {
     }
   }
 
-  resolveSymbolsCallDeps2(cubeName, sql) {
-    const deps = [];
+  protected resolveSymbolsCallDeps2(cubeName, sql) {
+    const deps: any[] = [];
     this.resolveSymbolsCall(sql, (name) => {
       deps.push({ name, undefined });
       const resolvedSymbol = this.resolveSymbol(
@@ -605,15 +671,19 @@ export class CubeSymbols {
     return deps;
   }
 
-  depsContextSymbols() {
+  protected depsContextSymbols() {
     return Object.assign({
       filterParams: this.filtersProxyDep(),
       filterGroup: this.filterGroupFunctionDep(),
-      securityContext: BaseQuery.contextSymbolsProxyFrom({}, (param) => param)
+      securityContext: BaseQuery.contextSymbolsProxyFrom({}, (param) => param),
+      sqlUtils: {
+        convertTz: (f) => f
+
+      },
     });
   }
 
-  filtersProxyDep() {
+  protected filtersProxyDep() {
     return new Proxy({}, {
       get: (target, name) => {
         if (name === '_objectWithResolvedProperties') {
@@ -621,6 +691,7 @@ export class CubeSymbols {
         }
         // allFilters is null whenever it's used to test if the member is owned by cube so it should always render to `1 = 1`
         // and do not check cube validity as it's part of compilation step.
+        // @ts-ignore
         const cubeName = this.cubeNameFromPath(name);
         return new Proxy({ cube: cubeName }, {
           get: (cubeNameObj, propertyName) => ({
@@ -629,6 +700,7 @@ export class CubeSymbols {
                 return column;
               },
               __member() {
+                // @ts-ignore
                 return this.pathFromArray([cubeNameObj.cube, propertyName]);
               },
               toString() {
@@ -641,11 +713,11 @@ export class CubeSymbols {
     });
   }
 
-  filterGroupFunctionDep() {
+  protected filterGroupFunctionDep() {
     return (...filterParamArgs) => '';
   }
 
-  resolveSymbol(cubeName, name) {
+  public resolveSymbol(cubeName, name) {
     const { sqlResolveFn, contextSymbols, collectJoinHints, depsResolveFn, currResolveIndexFn } = this.resolveSymbolsCallContext || {};
 
     if (name === 'USER_CONTEXT') {
@@ -691,7 +763,7 @@ export class CubeSymbols {
     return cube || (this.symbols[cubeName] && this.symbols[cubeName][name]);
   }
 
-  cubeReferenceProxy(cubeName, joinHints, refProperty) {
+  protected cubeReferenceProxy(cubeName, joinHints?: any[], refProperty?: any) {
     if (joinHints) {
       joinHints = joinHints.concat(cubeName);
     }
@@ -769,7 +841,7 @@ export class CubeSymbols {
    * @param {string|string[]} path
    * @param [refCube] Optional cube object to operate on
    */
-  resolveGranularity(path, refCube) {
+  public resolveGranularity(path: string | string[], refCube?: any) {
     const [cubeName, dimName, gr, granName] = Array.isArray(path) ? path : path.split('.');
     const cube = refCube || this.symbols[cubeName];
 
@@ -781,7 +853,7 @@ export class CubeSymbols {
     return cube && cube[dimName] && cube[dimName][gr] && cube[dimName][gr][granName];
   }
 
-  cubeDependenciesProxy(parentIndex, cubeName) {
+  protected cubeDependenciesProxy(parentIndex, cubeName) {
     const self = this;
     const { depsResolveFn } = self.resolveSymbolsCallContext || {};
     return new Proxy({}, {
@@ -819,7 +891,7 @@ export class CubeSymbols {
     });
   }
 
-  isCurrentCube(name) {
+  public isCurrentCube(name) {
     return CURRENT_CUBE_CONSTANTS.indexOf(name) >= 0;
   }
 }
diff --git a/packages/cubejs-schema-compiler/src/compiler/DataSchemaCompiler.js b/packages/cubejs-schema-compiler/src/compiler/DataSchemaCompiler.js
index 0d16153fad..cfd770fbc9 100644
--- a/packages/cubejs-schema-compiler/src/compiler/DataSchemaCompiler.js
+++ b/packages/cubejs-schema-compiler/src/compiler/DataSchemaCompiler.js
@@ -6,10 +6,13 @@ import { parse } from '@babel/parser';
 import babelGenerator from '@babel/generator';
 import babelTraverse from '@babel/traverse';
 import R from 'ramda';
+import workerpool from 'workerpool';
 
-import { isNativeSupported } from '@cubejs-backend/shared';
+import { getEnv, isNativeSupported } from '@cubejs-backend/shared';
+import { transpileJs } from '@cubejs-backend/native';
 import { UserError } from './UserError';
 import { ErrorReporter } from './ErrorReporter';
+import { CONTEXT_SYMBOLS } from './CubeSymbols';
 
 const NATIVE_IS_SUPPORTED = isNativeSupported();
 
@@ -23,9 +26,13 @@ export class DataSchemaCompiler {
     this.cubeCompilers = options.cubeCompilers || [];
     this.contextCompilers = options.contextCompilers || [];
     this.transpilers = options.transpilers || [];
+    this.viewCompilers = options.viewCompilers || [];
     this.preTranspileCubeCompilers = options.preTranspileCubeCompilers || [];
+    this.viewCompilationGate = options.viewCompilationGate;
     this.cubeNameCompilers = options.cubeNameCompilers || [];
     this.extensions = options.extensions || {};
+    this.cubeDictionary = options.cubeDictionary;
+    this.cubeSymbols = options.cubeSymbols;
     this.cubeFactory = options.cubeFactory;
     this.filesToCompile = options.filesToCompile;
     this.omitErrors = options.omitErrors;
@@ -38,6 +45,8 @@ export class DataSchemaCompiler {
     this.yamlCompiler = options.yamlCompiler;
     this.yamlCompiler.dataSchemaCompiler = this;
     this.pythonContext = null;
+    this.workerPool = null;
+    this.compilerId = options.compilerId;
   }
 
   compileObjects(compileServices, objects, errorsReport) {
@@ -87,17 +96,95 @@ export class DataSchemaCompiler {
     const errorsReport = new ErrorReporter(null, [], this.errorReport);
     this.errorsReport = errorsReport;
 
-    // TODO: required in order to get pre transpile compilation work
-    const transpile = () => toCompile.map(f => this.transpileFile(f, errorsReport)).filter(f => !!f);
+    const transpilationWorkerThreads = getEnv('transpilationWorkerThreads');
+    const transpilationNative = getEnv('transpilationNative');
+    const { compilerId } = this;
 
-    const compilePhase = (compilers) => this.compileCubeFiles(compilers, transpile(), errorsReport);
+    if (!transpilationNative && transpilationWorkerThreads) {
+      const wc = getEnv('transpilationWorkerThreadsCount');
+      this.workerPool = workerpool.pool(
+        path.join(__dirname, 'transpilers/transpiler_worker'),
+        wc > 0 ? { maxWorkers: wc } : undefined,
+      );
+    }
+
+    const transpile = async () => {
+      let cubeNames;
+      let cubeSymbols;
+      let transpilerNames;
+      let results;
+
+      if (transpilationNative || transpilationWorkerThreads) {
+        cubeNames = Object.keys(this.cubeDictionary.byId);
+        // We need only cubes and all its member names for transpiling.
+        // Cubes doesn't change during transpiling, but are changed during compilation phase,
+        // so we can prepare them once for every phase.
+        // Communication between main and worker threads uses
+        // The structured clone algorithm (@see https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm)
+        // which doesn't allow passing any function objects, so we need to sanitize the symbols.
+        // Communication with native backend also involves deserialization.
+        cubeSymbols = Object.fromEntries(
+          Object.entries(this.cubeSymbols.symbols)
+            .map(
+              ([key, value]) => [key, Object.fromEntries(
+                Object.keys(value).map((k) => [k, true]),
+              )],
+            ),
+        );
+
+        // Transpilers are the same for all files within phase.
+        transpilerNames = this.transpilers.map(t => t.constructor.name);
+      }
+
+      if (transpilationNative) {
+        // Warming up swc compiler cache
+        const dummyFile = {
+          fileName: 'dummy.js',
+          content: ';',
+        };
+
+        await this.transpileJsFile(dummyFile, errorsReport, { cubeNames, cubeSymbols, transpilerNames, contextSymbols: CONTEXT_SYMBOLS, compilerId });
+
+        results = await Promise.all(toCompile.map(f => this.transpileFile(f, errorsReport, { transpilerNames, compilerId })));
+      } else if (transpilationWorkerThreads) {
+        results = await Promise.all(toCompile.map(f => this.transpileFile(f, errorsReport, { cubeNames, cubeSymbols, transpilerNames })));
+      } else {
+        results = await Promise.all(toCompile.map(f => this.transpileFile(f, errorsReport, {})));
+      }
+
+      return results.filter(f => !!f);
+    };
+
+    const compilePhase = async (compilers) => this.compileCubeFiles(compilers, await transpile(), errorsReport);
 
     return compilePhase({ cubeCompilers: this.cubeNameCompilers })
-      .then(() => compilePhase({ cubeCompilers: this.preTranspileCubeCompilers }))
+      .then(() => compilePhase({ cubeCompilers: this.preTranspileCubeCompilers.concat([this.viewCompilationGate]) }))
+      .then(() => (this.viewCompilationGate.shouldCompileViews() ?
+        compilePhase({ cubeCompilers: this.viewCompilers })
+        : Promise.resolve()))
       .then(() => compilePhase({
         cubeCompilers: this.cubeCompilers,
         contextCompilers: this.contextCompilers,
-      }));
+      }))
+      .then(() => {
+        if (transpilationNative) {
+          // Clean up cache
+          const dummyFile = {
+            fileName: 'terminate.js',
+            content: ';',
+          };
+
+          return this.transpileJsFile(
+            dummyFile,
+            errorsReport,
+            { cubeNames: [], cubeSymbols: {}, transpilerNames: [], contextSymbols: {}, compilerId: this.compilerId }
+          );
+        } else if (transpilationWorkerThreads && this.workerPool) {
+          this.workerPool.terminate();
+        }
+
+        return Promise.resolve();
+      });
   }
 
   compile() {
@@ -113,7 +200,7 @@ export class DataSchemaCompiler {
     return this.compilePromise;
   }
 
-  transpileFile(file, errorsReport) {
+  async transpileFile(file, errorsReport, options) {
     if (R.endsWith('.jinja', file.fileName) ||
       (R.endsWith('.yml', file.fileName) || R.endsWith('.yaml', file.fileName))
       // TODO do Jinja syntax check with jinja compiler
@@ -132,31 +219,68 @@ export class DataSchemaCompiler {
     } else if (R.endsWith('.yml', file.fileName) || R.endsWith('.yaml', file.fileName)) {
       return file;
     } else if (R.endsWith('.js', file.fileName)) {
-      return this.transpileJsFile(file, errorsReport);
+      return this.transpileJsFile(file, errorsReport, options);
     } else {
       return file;
     }
   }
 
-  transpileJsFile(file, errorsReport) {
+  async transpileJsFile(file, errorsReport, { cubeNames, cubeSymbols, contextSymbols, transpilerNames, compilerId }) {
     try {
-      const ast = parse(
-        file.content,
-        {
-          sourceFilename: file.fileName,
-          sourceType: 'module',
-          plugins: ['objectRestSpread']
-        },
-      );
+      if (getEnv('transpilationNative')) {
+        const reqData = {
+          fileName: file.fileName,
+          transpilers: transpilerNames,
+          compilerId,
+          ...(cubeNames && {
+            metaData: {
+              cubeNames,
+              cubeSymbols,
+              contextSymbols,
+            },
+          }),
+        };
 
-      this.transpilers.forEach((t) => {
         errorsReport.inFile(file);
-        babelTraverse(ast, t.traverseObject(errorsReport));
+        const res = await transpileJs(file.content, reqData);
+        errorsReport.addErrors(res.errors);
+        errorsReport.addWarnings(res.warnings);
         errorsReport.exitFile();
-      });
 
-      const content = babelGenerator(ast, {}, file.content).code;
-      return Object.assign({}, file, { content });
+        return Object.assign({}, file, { content: res.code });
+      } else if (getEnv('transpilationWorkerThreads')) {
+        const data = {
+          fileName: file.fileName,
+          content: file.content,
+          transpilers: transpilerNames,
+          cubeNames,
+          cubeSymbols,
+        };
+
+        const res = await this.workerPool.exec('transpile', [data]);
+        errorsReport.addErrors(res.errors);
+        errorsReport.addWarnings(res.warnings);
+
+        return Object.assign({}, file, { content: res.content });
+      } else {
+        const ast = parse(
+          file.content,
+          {
+            sourceFilename: file.fileName,
+            sourceType: 'module',
+            plugins: ['objectRestSpread'],
+          },
+        );
+
+        errorsReport.inFile(file);
+        this.transpilers.forEach((t) => {
+          babelTraverse(ast, t.traverseObject(errorsReport));
+        });
+        errorsReport.exitFile();
+
+        const content = babelGenerator(ast, {}, file.content).code;
+        return Object.assign({}, file, { content });
+      }
     } catch (e) {
       if (e.toString().indexOf('SyntaxError') !== -1) {
         const line = file.content.split('\n')[e.loc.line - 1];
diff --git a/packages/cubejs-schema-compiler/src/compiler/ErrorReporter.ts b/packages/cubejs-schema-compiler/src/compiler/ErrorReporter.ts
index 8407dd8605..a482764758 100644
--- a/packages/cubejs-schema-compiler/src/compiler/ErrorReporter.ts
+++ b/packages/cubejs-schema-compiler/src/compiler/ErrorReporter.ts
@@ -3,6 +3,12 @@ import { codeFrameColumns, SourceLocation } from '@babel/code-frame';
 import { UserError } from './UserError';
 import { CompileError } from './CompileError';
 
+export type ErrorLikeObject = {
+  message: string;
+};
+
+export type PossibleError = Error | UserError | string | ErrorLikeObject;
+
 export interface CompilerErrorInterface {
   message: string;
   plainMessage?: string
@@ -108,7 +114,7 @@ export class ErrorReporter {
   }
 
   public error(e: any, fileName?: any, lineNumber?: any, position?: any) {
-    const message = `${this.context.length ? `${this.context.join(' -> ')}: ` : ''}${e instanceof UserError ? e.message : (e.stack || e)}`;
+    const message = `${this.context.length ? `${this.context.join(' -> ')}: ` : ''}${e.message ? e.message : (e.stack || e)}`;
     if (this.rootReporter().errors.find(m => (m.message || m) === message)) {
       return;
     }
@@ -137,6 +143,22 @@ export class ErrorReporter {
     }
   }
 
+  public getErrors() {
+    return this.rootReporter().errors;
+  }
+
+  public addErrors(errors: PossibleError[]) {
+    errors.forEach((e: any) => { this.error(e); });
+  }
+
+  public getWarnings() {
+    return this.rootReporter().warnings;
+  }
+
+  public addWarnings(warnings: SyntaxErrorInterface[]) {
+    warnings.forEach(w => { this.warning(w); });
+  }
+
   protected rootReporter(): ErrorReporter {
     return this.parent ? this.parent.rootReporter() : this;
   }
diff --git a/packages/cubejs-schema-compiler/src/compiler/PrepareCompiler.ts b/packages/cubejs-schema-compiler/src/compiler/PrepareCompiler.ts
index 446769688f..57f615c2b7 100644
--- a/packages/cubejs-schema-compiler/src/compiler/PrepareCompiler.ts
+++ b/packages/cubejs-schema-compiler/src/compiler/PrepareCompiler.ts
@@ -20,6 +20,7 @@ import { JoinGraph } from './JoinGraph';
 import { CubeToMetaTransformer } from './CubeToMetaTransformer';
 import { CompilerCache } from './CompilerCache';
 import { YamlCompiler } from './YamlCompiler';
+import { ViewCompilationGate } from './ViewCompilationGate';
 
 export type PrepareCompilerOptions = {
   nativeInstance?: NativeInstance,
@@ -37,6 +38,8 @@ export const prepareCompiler = (repo: SchemaFileRepository, options: PrepareComp
   const nativeInstance = options.nativeInstance || new NativeInstance();
   const cubeDictionary = new CubeDictionary();
   const cubeSymbols = new CubeSymbols();
+  const viewCompiler = new CubeSymbols(true);
+  const viewCompilationGate = new ViewCompilationGate();
   const cubeValidator = new CubeValidator(cubeSymbols);
   const cubeEvaluator = new CubeEvaluator(cubeValidator);
   const contextEvaluator = new ContextEvaluator(cubeEvaluator);
@@ -44,26 +47,32 @@ export const prepareCompiler = (repo: SchemaFileRepository, options: PrepareComp
   const metaTransformer = new CubeToMetaTransformer(cubeValidator, cubeEvaluator, contextEvaluator, joinGraph);
   const { maxQueryCacheSize, maxQueryCacheAge } = options;
   const compilerCache = new CompilerCache({ maxQueryCacheSize, maxQueryCacheAge });
-  const yamlCompiler = new YamlCompiler(cubeSymbols, cubeDictionary, nativeInstance);
+  const yamlCompiler = new YamlCompiler(cubeSymbols, cubeDictionary, nativeInstance, viewCompiler);
 
   const transpilers: TranspilerInterface[] = [
     new ValidationTranspiler(),
     new ImportExportTranspiler(),
-    new CubePropContextTranspiler(cubeSymbols, cubeDictionary),
+    new CubePropContextTranspiler(cubeSymbols, cubeDictionary, viewCompiler),
   ];
 
   if (!options.allowJsDuplicatePropsInSchema) {
     transpilers.push(new CubeCheckDuplicatePropTranspiler());
   }
 
+  const compilerId = uuidv4();
+
   const compiler = new DataSchemaCompiler(repo, Object.assign({}, {
     cubeNameCompilers: [cubeDictionary],
     preTranspileCubeCompilers: [cubeSymbols, cubeValidator],
     transpilers,
+    viewCompilationGate,
+    viewCompilers: [viewCompiler],
     cubeCompilers: [cubeEvaluator, joinGraph, metaTransformer],
     contextCompilers: [contextEvaluator],
     cubeFactory: cubeSymbols.createCube.bind(cubeSymbols),
     compilerCache,
+    cubeDictionary,
+    cubeSymbols,
     extensions: {
       Funnels,
       RefreshKeys,
@@ -72,7 +81,8 @@ export const prepareCompiler = (repo: SchemaFileRepository, options: PrepareComp
     compileContext: options.compileContext,
     standalone: options.standalone,
     nativeInstance,
-    yamlCompiler
+    yamlCompiler,
+    compilerId,
   }, options));
 
   return {
@@ -83,7 +93,7 @@ export const prepareCompiler = (repo: SchemaFileRepository, options: PrepareComp
     joinGraph,
     compilerCache,
     headCommitId: options.headCommitId,
-    compilerId: uuidv4(),
+    compilerId,
   };
 };
 
diff --git a/packages/cubejs-schema-compiler/src/compiler/ViewCompilationGate.ts b/packages/cubejs-schema-compiler/src/compiler/ViewCompilationGate.ts
new file mode 100644
index 0000000000..af53f12f30
--- /dev/null
+++ b/packages/cubejs-schema-compiler/src/compiler/ViewCompilationGate.ts
@@ -0,0 +1,30 @@
+export class ViewCompilationGate {
+  private shouldCompile: any;
+
+  public constructor() {
+    this.shouldCompile = false;
+  }
+
+  public compile(cubes: any[]) {
+    // When developing Data Access Policies feature, we've came across a
+    // limitation that Cube members can't be referenced in access policies defined on Views,
+    // because views aren't (yet) compiled at the time of access policy evaluation.
+    // To workaround this limitation and additional compilation pass is necessary,
+    // however it comes with a significant performance penalty.
+    // This gate check whether the data model contains views with access policies,
+    // and only then allows the additional compilation pass.
+    //
+    // Check out the DataSchemaCompiler.ts to see how this gate is used.
+    if (this.viewsHaveAccessPolicies(cubes)) {
+      this.shouldCompile = true;
+    }
+  }
+
+  private viewsHaveAccessPolicies(cubes: any[]) {
+    return cubes.some(c => c.isView && c.accessPolicy);
+  }
+
+  public shouldCompileViews() {
+    return this.shouldCompile;
+  }
+}
diff --git a/packages/cubejs-schema-compiler/src/compiler/YamlCompiler.ts b/packages/cubejs-schema-compiler/src/compiler/YamlCompiler.ts
index 3ac750737d..30933af64d 100644
--- a/packages/cubejs-schema-compiler/src/compiler/YamlCompiler.ts
+++ b/packages/cubejs-schema-compiler/src/compiler/YamlCompiler.ts
@@ -33,6 +33,7 @@ export class YamlCompiler {
     private readonly cubeSymbols: CubeSymbols,
     private readonly cubeDictionary: CubeDictionary,
     private readonly nativeInstance: NativeInstance,
+    private readonly viewCompiler: CubeSymbols,
   ) {
   }
 
@@ -288,7 +289,9 @@ export class YamlCompiler {
       },
     );
 
-    resolveSymbol = resolveSymbol || (n => this.cubeSymbols.resolveSymbol(cubeName, n) || this.cubeSymbols.isCurrentCube(n));
+    resolveSymbol = resolveSymbol || (n => this.viewCompiler.resolveSymbol(cubeName, n) ||
+      this.cubeSymbols.resolveSymbol(cubeName, n) ||
+      this.cubeSymbols.isCurrentCube(n));
 
     const traverseObj = {
       Program: (babelPath) => {
diff --git a/packages/cubejs-schema-compiler/src/compiler/transpilers/CubePropContextTranspiler.ts b/packages/cubejs-schema-compiler/src/compiler/transpilers/CubePropContextTranspiler.ts
index e0ece55a88..2ffc96058b 100644
--- a/packages/cubejs-schema-compiler/src/compiler/transpilers/CubePropContextTranspiler.ts
+++ b/packages/cubejs-schema-compiler/src/compiler/transpilers/CubePropContextTranspiler.ts
@@ -2,7 +2,12 @@ import * as t from '@babel/types';
 import R from 'ramda';
 
 import type { NodePath } from '@babel/traverse';
-import type { TranspilerInterface, TraverseObject } from './transpiler.interface';
+import {
+  TranspilerCubeResolver,
+  TranspilerInterface,
+  TranspilerSymbolResolver,
+  TraverseObject
+} from './transpiler.interface';
 import type { CubeSymbols } from '../CubeSymbols';
 import type { CubeDictionary } from '../CubeDictionary';
 
@@ -39,8 +44,9 @@ transpiledFieldsPatterns?.forEach((r) => {
 
 export class CubePropContextTranspiler implements TranspilerInterface {
   public constructor(
-    protected readonly cubeSymbols: CubeSymbols,
-    protected readonly cubeDictionary: CubeDictionary,
+    protected readonly cubeSymbols: TranspilerSymbolResolver,
+    protected readonly cubeDictionary: TranspilerCubeResolver,
+    protected readonly viewCompiler: TranspilerSymbolResolver,
   ) {
   }
 
@@ -88,7 +94,9 @@ export class CubePropContextTranspiler implements TranspilerInterface {
   }
 
   protected sqlAndReferencesFieldVisitor(cubeName): TraverseObject {
-    const resolveSymbol = n => this.cubeSymbols.resolveSymbol(cubeName, n) || this.cubeSymbols.isCurrentCube(n);
+    const resolveSymbol = n => this.viewCompiler.resolveSymbol(cubeName, n) ||
+      this.cubeSymbols.resolveSymbol(cubeName, n) ||
+      this.cubeSymbols.isCurrentCube(n);
 
     return {
       ObjectProperty: (path) => {
diff --git a/packages/cubejs-schema-compiler/src/compiler/transpilers/LightweightNodeCubeDictionary.ts b/packages/cubejs-schema-compiler/src/compiler/transpilers/LightweightNodeCubeDictionary.ts
new file mode 100644
index 0000000000..159dbb8377
--- /dev/null
+++ b/packages/cubejs-schema-compiler/src/compiler/transpilers/LightweightNodeCubeDictionary.ts
@@ -0,0 +1,14 @@
+import { TranspilerCubeResolver } from './transpiler.interface';
+
+export class LightweightNodeCubeDictionary implements TranspilerCubeResolver {
+  public constructor(private cubeNames: string[] = []) {
+  }
+
+  public resolveCube(name: string): boolean {
+    return this.cubeNames.includes(name);
+  }
+
+  public setCubeNames(cubeNames: string[]): void {
+    this.cubeNames = cubeNames;
+  }
+}
diff --git a/packages/cubejs-schema-compiler/src/compiler/transpilers/LightweightSymbolResolver.ts b/packages/cubejs-schema-compiler/src/compiler/transpilers/LightweightSymbolResolver.ts
new file mode 100644
index 0000000000..1041a6190c
--- /dev/null
+++ b/packages/cubejs-schema-compiler/src/compiler/transpilers/LightweightSymbolResolver.ts
@@ -0,0 +1,30 @@
+import { TranspilerSymbolResolver } from './transpiler.interface';
+import { CONTEXT_SYMBOLS, CURRENT_CUBE_CONSTANTS } from '../CubeSymbols';
+
+type CubeSymbols = Record<string, Record<string, boolean>>;
+
+export class LightweightSymbolResolver implements TranspilerSymbolResolver {
+  public constructor(private symbols: CubeSymbols = {}) {
+  }
+
+  public setSymbols(symbols: CubeSymbols) {
+    this.symbols = symbols;
+  }
+
+  public isCurrentCube(name): boolean {
+    return CURRENT_CUBE_CONSTANTS.indexOf(name) >= 0;
+  }
+
+  public resolveSymbol(cubeName, name): any {
+    if (name === 'USER_CONTEXT') {
+      throw new Error('Support for USER_CONTEXT was removed, please migrate to SECURITY_CONTEXT.');
+    }
+
+    if (CONTEXT_SYMBOLS[name]) {
+      return true;
+    }
+
+    const cube = this.symbols[this.isCurrentCube(name) ? cubeName : name];
+    return cube || (this.symbols[cubeName] && this.symbols[cubeName][name]);
+  }
+}
diff --git a/packages/cubejs-schema-compiler/src/compiler/transpilers/transpiler.interface.ts b/packages/cubejs-schema-compiler/src/compiler/transpilers/transpiler.interface.ts
index 0f15c6f840..803a1c0fa4 100644
--- a/packages/cubejs-schema-compiler/src/compiler/transpilers/transpiler.interface.ts
+++ b/packages/cubejs-schema-compiler/src/compiler/transpilers/transpiler.interface.ts
@@ -6,3 +6,12 @@ export type TraverseObject = TraverseOptions;
 export interface TranspilerInterface {
   traverseObject(reporter: ErrorReporter): TraverseObject;
 }
+
+export interface TranspilerSymbolResolver {
+  resolveSymbol(cubeName, name): any;
+  isCurrentCube(name): boolean;
+}
+
+export interface TranspilerCubeResolver {
+  resolveCube(name): boolean;
+}
diff --git a/packages/cubejs-schema-compiler/src/compiler/transpilers/transpiler_worker.ts b/packages/cubejs-schema-compiler/src/compiler/transpilers/transpiler_worker.ts
new file mode 100644
index 0000000000..93c1c14274
--- /dev/null
+++ b/packages/cubejs-schema-compiler/src/compiler/transpilers/transpiler_worker.ts
@@ -0,0 +1,67 @@
+import workerpool from 'workerpool';
+import { parse } from '@babel/parser';
+import babelGenerator from '@babel/generator';
+import babelTraverse from '@babel/traverse';
+
+import { ValidationTranspiler } from './ValidationTranspiler';
+import { ImportExportTranspiler } from './ImportExportTranspiler';
+import { CubeCheckDuplicatePropTranspiler } from './CubeCheckDuplicatePropTranspiler';
+import { CubePropContextTranspiler } from './CubePropContextTranspiler';
+import { ErrorReporter } from '../ErrorReporter';
+import { LightweightSymbolResolver } from './LightweightSymbolResolver';
+import { LightweightNodeCubeDictionary } from './LightweightNodeCubeDictionary';
+
+type TransferContent = {
+  fileName: string;
+  content: string;
+  transpilers: string[];
+  cubeNames: string[];
+  cubeSymbols: Record<string, Record<string, boolean>>;
+};
+
+const cubeDictionary = new LightweightNodeCubeDictionary();
+const cubeSymbols = new LightweightSymbolResolver();
+const errorsReport = new ErrorReporter(null, []);
+
+const transpilers = {
+  ValidationTranspiler: new ValidationTranspiler(),
+  ImportExportTranspiler: new ImportExportTranspiler(),
+  CubeCheckDuplicatePropTranspiler: new CubeCheckDuplicatePropTranspiler(),
+  CubePropContextTranspiler: new CubePropContextTranspiler(cubeSymbols, cubeDictionary, cubeSymbols),
+};
+
+const transpile = (data: TransferContent) => {
+  cubeDictionary.setCubeNames(data.cubeNames);
+  cubeSymbols.setSymbols(data.cubeSymbols);
+
+  const ast = parse(
+    data.content,
+    {
+      sourceFilename: data.fileName,
+      sourceType: 'module',
+      plugins: ['objectRestSpread']
+    },
+  );
+
+  errorsReport.inFile(data);
+  data.transpilers.forEach(transpilerName => {
+    if (transpilers[transpilerName]) {
+      babelTraverse(ast, transpilers[transpilerName].traverseObject(errorsReport));
+    } else {
+      throw new Error(`Transpiler ${transpilerName} not supported`);
+    }
+  });
+  errorsReport.exitFile();
+
+  const content = babelGenerator(ast, {}, data.content).code;
+
+  return {
+    content,
+    errors: errorsReport.getErrors(),
+    warnings: errorsReport.getWarnings()
+  };
+};
+
+workerpool.worker({
+  transpile,
+});
diff --git a/packages/cubejs-schema-compiler/test/integration/postgres/pre-agg-allow-non-strict.test.ts b/packages/cubejs-schema-compiler/test/integration/postgres/pre-agg-allow-non-strict.test.ts
index 7779b7c2ca..0a19233ab4 100644
--- a/packages/cubejs-schema-compiler/test/integration/postgres/pre-agg-allow-non-strict.test.ts
+++ b/packages/cubejs-schema-compiler/test/integration/postgres/pre-agg-allow-non-strict.test.ts
@@ -195,6 +195,16 @@ const getQueries = (compiler, joinGraph, cubeEvaluator) => ([
     }],
     timezone: 'America/Los_Angeles',
   }),
+  // no granularity
+  new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {
+    measures: ['cube.totalQuantity', 'cube.totalProfit'],
+    dimensions: ['cube.city'],
+    timeDimensions: [{
+      dimension: 'cube.orderDate',
+      dateRange: ['2020-01-01 00:00:00.000', '2020-03-30 22:50:50.999'],
+    }],
+    timezone: 'America/Los_Angeles',
+  }),
 ]);
 
 describe(
@@ -205,7 +215,7 @@ describe(
 
       const { compiler, joinGraph, cubeEvaluator } =
         prepareCompiler(getCube(true, false, false));
-      
+
       it('month query with the `month` granularity match `MonthlyData`', async () => {
         await compiler.compile();
         const [request] = getQueries(compiler, joinGraph, cubeEvaluator);
@@ -259,6 +269,15 @@ describe(
         expect(query.indexOf('cube__daily_data')).toEqual(-1);
         expect(query.indexOf('cube__hourly_data')).toEqual(-1);
       });
+
+      it('query with no granularity match MonthlyData', async () => {
+        await compiler.compile();
+        const [,,,,,, request] = getQueries(compiler, joinGraph, cubeEvaluator);
+        const [query] = request.buildSqlAndParams();
+        expect(query.indexOf('cube__monthly_data')).toBeGreaterThanOrEqual(0);
+        expect(query.indexOf('cube__daily_data')).toEqual(-1);
+        expect(query.indexOf('cube__hourly_data')).toEqual(-1);
+      });
     });
 
     describe('The `DailyData` pre-aggregation with the `allowNonStrictDateRangeMatch` enabled', () => {
@@ -266,7 +285,7 @@ describe(
 
       const { compiler, joinGraph, cubeEvaluator } =
         prepareCompiler(getCube(false, true, false));
-      
+
       it('month query with the `month` granularity match `MonthlyData`', async () => {
         await compiler.compile();
         const [request] = getQueries(compiler, joinGraph, cubeEvaluator);
@@ -294,7 +313,7 @@ describe(
         expect(query.indexOf('cube__hourly_data')).toEqual(-1);
       });
 
-      it('hour query with the `week` granularity match `HourlyData`', async () => {
+      it('hour query with the `week` granularity match `DailyData`', async () => {
         await compiler.compile();
         const [,,, request] = getQueries(compiler, joinGraph, cubeEvaluator);
         const [query] = request.buildSqlAndParams();
@@ -320,6 +339,15 @@ describe(
         expect(query.indexOf('cube__daily_data')).toBeGreaterThanOrEqual(0);
         expect(query.indexOf('cube__hourly_data')).toEqual(-1);
       });
+
+      it('query with no granularity match MonthlyData', async () => {
+        await compiler.compile();
+        const [,,,,,, request] = getQueries(compiler, joinGraph, cubeEvaluator);
+        const [query] = request.buildSqlAndParams();
+        expect(query.indexOf('cube__monthly_data')).toEqual(-1);
+        expect(query.indexOf('cube__daily_data')).toBeGreaterThanOrEqual(0);
+        expect(query.indexOf('cube__hourly_data')).toEqual(-1);
+      });
     });
 
     describe('The `HourlyData` pre-aggregation with the `allowNonStrictDateRangeMatch` enabled', () => {
@@ -327,7 +355,7 @@ describe(
 
       const { compiler, joinGraph, cubeEvaluator } =
         prepareCompiler(getCube(false, false, true));
-      
+
       it('month query with the `month` granularity match `MonthlyData`', async () => {
         await compiler.compile();
         const [request] = getQueries(compiler, joinGraph, cubeEvaluator);
@@ -381,6 +409,15 @@ describe(
         expect(query.indexOf('cube__daily_data')).toEqual(-1);
         expect(query.indexOf('cube__hourly_data')).toBeGreaterThanOrEqual(0);
       });
+
+      it('query with no granularity match HourlyData', async () => {
+        await compiler.compile();
+        const [,,,,,, request] = getQueries(compiler, joinGraph, cubeEvaluator);
+        const [query] = request.buildSqlAndParams();
+        expect(query.indexOf('cube__monthly_data')).toEqual(-1);
+        expect(query.indexOf('cube__daily_data')).toEqual(-1);
+        expect(query.indexOf('cube__hourly_data')).toBeGreaterThanOrEqual(0);
+      });
     });
 
     describe('`MonthlyData` and `DailyData` pre-aggregations with the `allowNonStrictDateRangeMatch` enabled', () => {
@@ -388,7 +425,7 @@ describe(
 
       const { compiler, joinGraph, cubeEvaluator } =
         prepareCompiler(getCube(true, true, false));
-      
+
       it('month query with the `month` granularity match `MonthlyData`', async () => {
         await compiler.compile();
         const [request] = getQueries(compiler, joinGraph, cubeEvaluator);
@@ -449,7 +486,7 @@ describe(
 
       const { compiler, joinGraph, cubeEvaluator } =
         prepareCompiler(getCube(true, false, true));
-      
+
       it('month query with the `month` granularity match `MonthlyData`', async () => {
         await compiler.compile();
         const [request] = getQueries(compiler, joinGraph, cubeEvaluator);
@@ -510,7 +547,7 @@ describe(
 
       const { compiler, joinGraph, cubeEvaluator } =
         prepareCompiler(getCube(false, true, true));
-      
+
       it('month query with the `month` granularity match `MonthlyData`', async () => {
         await compiler.compile();
         const [request] = getQueries(compiler, joinGraph, cubeEvaluator);
@@ -571,7 +608,7 @@ describe(
 
       const { compiler, joinGraph, cubeEvaluator } =
         prepareCompiler(getCube(true, true, true));
-      
+
       it('month query with the `month` granularity match `MonthlyData`', async () => {
         await compiler.compile();
         const [request] = getQueries(compiler, joinGraph, cubeEvaluator);
diff --git a/packages/cubejs-schema-compiler/test/integration/postgres/pre-aggregations.test.ts b/packages/cubejs-schema-compiler/test/integration/postgres/pre-aggregations.test.ts
index eb24efc8ff..b3d191d8f5 100644
--- a/packages/cubejs-schema-compiler/test/integration/postgres/pre-aggregations.test.ts
+++ b/packages/cubejs-schema-compiler/test/integration/postgres/pre-aggregations.test.ts
@@ -94,7 +94,13 @@ describe('PreAggregations', () => {
         },
         createdAt: {
           type: 'time',
-          sql: 'created_at'
+          sql: 'created_at',
+          granularities: {
+            hourTenMinOffset: {
+              interval: '1 hour',
+              offset: '10 minutes'
+            }
+          }
         },
         signedUpAt: {
           type: 'time',
@@ -224,11 +230,17 @@ describe('PreAggregations', () => {
           granularity: 'hour',
           partitionGranularity: 'month'
         },
+        countCustomGranularity: {
+          measures: [count],
+          timeDimension: createdAt,
+          granularity: 'hourTenMinOffset'
+        },
         sourceAndIdRollup: {
           measures: [count],
           dimensions: [sourceAndId, source],
           timeDimension: createdAt,
           granularity: 'hour',
+          allowNonStrictDateRangeMatch: true
         },
         visitorsMultiplied: {
           measures: [count],
@@ -546,6 +558,92 @@ describe('PreAggregations', () => {
     });
   }));
 
+  it('simple pre-aggregation (allowNonStrictDateRangeMatch: true)', () => compiler.compile().then(() => {
+    const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {
+      measures: [
+        'visitors.count'
+      ],
+      timeDimensions: [{
+        dimension: 'visitors.createdAt',
+        dateRange: ['2017-01-01 00:10:00.000', '2017-01-29 22:59:59.999'],
+        granularity: 'hour',
+      }],
+      timezone: 'America/Los_Angeles',
+      preAggregationsSchema: ''
+    });
+
+    const queryAndParams = query.buildSqlAndParams();
+    console.log(queryAndParams);
+    expect(query.preAggregations?.preAggregationForQuery?.canUsePreAggregation).toEqual(true);
+    expect(queryAndParams[0]).toMatch(/visitors_source_and_id_rollup/);
+
+    return dbRunner.evaluateQueryWithPreAggregations(query).then(res => {
+      expect(res).toEqual(
+        [
+          {
+            visitors__count: '1',
+            visitors__created_at_hour: '2017-01-02T16:00:00.000Z',
+          },
+          {
+            visitors__count: '1',
+            visitors__created_at_hour: '2017-01-04T16:00:00.000Z',
+          },
+          {
+            visitors__count: '1',
+            visitors__created_at_hour: '2017-01-05T16:00:00.000Z',
+          },
+          {
+            visitors__count: '2',
+            visitors__created_at_hour: '2017-01-06T16:00:00.000Z',
+          },
+        ]
+      );
+    });
+  }));
+
+  it('simple pre-aggregation with custom granularity (exact match)', () => compiler.compile().then(() => {
+    const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {
+      measures: [
+        'visitors.count'
+      ],
+      timeDimensions: [{
+        dimension: 'visitors.createdAt',
+        dateRange: ['2017-01-01 00:10:00.000', '2017-01-29 22:09:59.999'],
+        granularity: 'hourTenMinOffset',
+      }],
+      timezone: 'America/Los_Angeles',
+      preAggregationsSchema: ''
+    });
+
+    const queryAndParams = query.buildSqlAndParams();
+    console.log(queryAndParams);
+    expect(query.preAggregations?.preAggregationForQuery?.canUsePreAggregation).toEqual(true);
+    expect(queryAndParams[0]).toMatch(/visitors_count_custom_granularity/);
+
+    return dbRunner.evaluateQueryWithPreAggregations(query).then(res => {
+      expect(res).toEqual(
+        [
+          {
+            visitors__count: '1',
+            visitors__created_at_hourTenMinOffset: '2017-01-02T15:10:00.000Z',
+          },
+          {
+            visitors__count: '1',
+            visitors__created_at_hourTenMinOffset: '2017-01-04T15:10:00.000Z',
+          },
+          {
+            visitors__count: '1',
+            visitors__created_at_hourTenMinOffset: '2017-01-05T15:10:00.000Z',
+          },
+          {
+            visitors__count: '2',
+            visitors__created_at_hourTenMinOffset: '2017-01-06T15:10:00.000Z',
+          },
+        ]
+      );
+    });
+  }));
+
   it('leaf measure pre-aggregation', () => compiler.compile().then(() => {
     const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {
       measures: [
diff --git a/packages/cubejs-schema-compiler/test/integration/postgres/sql-generation-logic.test.ts b/packages/cubejs-schema-compiler/test/integration/postgres/sql-generation-logic.test.ts
index c902b7d1fa..e8d6d6e4b2 100644
--- a/packages/cubejs-schema-compiler/test/integration/postgres/sql-generation-logic.test.ts
+++ b/packages/cubejs-schema-compiler/test/integration/postgres/sql-generation-logic.test.ts
@@ -453,7 +453,7 @@ describe('SQL Generation', () => {
     }
   });
 
-  it('having filter with operator OR 1', async () => {
+  it('having filter with operator OR', async () => {
     await compiler.compile();
 
     const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {
@@ -648,7 +648,7 @@ describe('SQL Generation', () => {
     });
   });
 
-  it('where filter with operators OR & AND 1', async () => {
+  it('where filter with operators OR & AND', async () => {
     await compiler.compile();
 
     const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {
diff --git a/packages/cubejs-schema-compiler/test/integration/postgres/sql-generation.test.ts b/packages/cubejs-schema-compiler/test/integration/postgres/sql-generation.test.ts
index 03740b7088..1fda04d9c0 100644
--- a/packages/cubejs-schema-compiler/test/integration/postgres/sql-generation.test.ts
+++ b/packages/cubejs-schema-compiler/test/integration/postgres/sql-generation.test.ts
@@ -79,6 +79,19 @@ describe('SQL Generation', () => {
             offset: 'start'
           }
         },
+        countRollingUnbounded: {
+          type: 'count',
+          rollingWindow: {
+            trailing: 'unbounded'
+          }
+        },
+        countRollingWeekToDate: {
+          type: 'count',
+          rollingWindow: {
+            type: 'to_date',
+            granularity: 'week'
+          }
+        },
         revenue_qtd: {
           type: 'sum',
           sql: 'amount',
@@ -220,7 +233,14 @@ describe('SQL Generation', () => {
         },
         created_at: {
           type: 'time',
-          sql: 'created_at'
+          sql: 'created_at',
+          granularities: {
+            three_days: {
+              interval: '3 days',
+              title: '3 days',
+              origin: '2017-01-01'
+            }
+          }
         },
         updated_at: {
           type: 'time',
@@ -778,6 +798,163 @@ describe('SQL Generation', () => {
     }
   ]));
 
+  it('rolling window with two time dimension granularities', async () => runQueryTest({
+    measures: [
+      'visitors.countRollingWeekToDate'
+    ],
+    timeDimensions: [
+      {
+        dimension: 'visitors.created_at',
+        granularity: 'three_days',
+        dateRange: ['2017-01-01', '2017-01-10']
+      },
+      {
+        dimension: 'visitors.created_at',
+        granularity: 'day',
+        dateRange: ['2017-01-01', '2017-01-10']
+      }
+    ],
+    order: [{
+      id: 'visitors.created_at'
+    }],
+    timezone: 'America/Los_Angeles'
+  }, [
+    {
+      visitors__count_rolling_week_to_date: null,
+      visitors__created_at_day: '2017-01-01T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-01T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_week_to_date: '1',
+      visitors__created_at_day: '2017-01-02T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-01T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_week_to_date: '1',
+      visitors__created_at_day: '2017-01-03T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-01T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_week_to_date: '2',
+      visitors__created_at_day: '2017-01-04T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-04T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_week_to_date: '3',
+      visitors__created_at_day: '2017-01-05T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-04T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_week_to_date: '5',
+      visitors__created_at_day: '2017-01-06T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-04T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_week_to_date: '5',
+      visitors__created_at_day: '2017-01-07T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-07T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_week_to_date: '5',
+      visitors__created_at_day: '2017-01-08T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-07T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_week_to_date: null,
+      visitors__created_at_day: '2017-01-09T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-07T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_week_to_date: null,
+      visitors__created_at_day: '2017-01-10T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-10T00:00:00.000Z',
+    }
+  ]));
+
+  it('two rolling windows with two time dimension granularities', async () => runQueryTest({
+    measures: [
+      'visitors.countRollingUnbounded',
+      'visitors.countRollingWeekToDate'
+    ],
+    timeDimensions: [
+      {
+        dimension: 'visitors.created_at',
+        granularity: 'three_days',
+        dateRange: ['2017-01-01', '2017-01-10']
+      },
+      {
+        dimension: 'visitors.created_at',
+        granularity: 'day',
+        dateRange: ['2017-01-01', '2017-01-10']
+      }
+    ],
+    order: [{
+      id: 'visitors.created_at'
+    }],
+    timezone: 'America/Los_Angeles'
+  }, [
+    {
+      visitors__count_rolling_unbounded: '1',
+      visitors__count_rolling_week_to_date: null,
+      visitors__created_at_day: '2017-01-01T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-01T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_unbounded: '2',
+      visitors__count_rolling_week_to_date: '1',
+      visitors__created_at_day: '2017-01-03T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-01T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_unbounded: '2',
+      visitors__count_rolling_week_to_date: '1',
+      visitors__created_at_day: '2017-01-02T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-01T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_unbounded: '3',
+      visitors__count_rolling_week_to_date: '2',
+      visitors__created_at_day: '2017-01-04T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-04T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_unbounded: '4',
+      visitors__count_rolling_week_to_date: '3',
+      visitors__created_at_day: '2017-01-05T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-04T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_unbounded: '6',
+      visitors__count_rolling_week_to_date: '5',
+      visitors__created_at_day: '2017-01-06T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-04T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_unbounded: '6',
+      visitors__count_rolling_week_to_date: '5',
+      visitors__created_at_day: '2017-01-08T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-07T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_unbounded: '6',
+      visitors__count_rolling_week_to_date: '5',
+      visitors__created_at_day: '2017-01-07T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-07T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_unbounded: '6',
+      visitors__count_rolling_week_to_date: null,
+      visitors__created_at_day: '2017-01-09T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-07T00:00:00.000Z',
+    },
+    {
+      visitors__count_rolling_unbounded: '6',
+      visitors__count_rolling_week_to_date: null,
+      visitors__created_at_day: '2017-01-10T00:00:00.000Z',
+      visitors__created_at_three_days: '2017-01-10T00:00:00.000Z',
+    }
+  ]));
+
   it('rolling month', async () => runQueryTest({
     measures: [
       'visitors.revenueRollingThreeDay'
@@ -945,8 +1122,6 @@ describe('SQL Generation', () => {
       timezone: 'America/Los_Angeles'
     });
 
-    console.log(query.buildSqlAndParams());
-
     expect(query.buildSqlAndParams()[0]).toMatch(/HLL_COUNT\.MERGE/);
     expect(query.buildSqlAndParams()[0]).toMatch(/HLL_COUNT\.INIT/);
   });
@@ -971,7 +1146,7 @@ describe('SQL Generation', () => {
 
     console.log(query.buildSqlAndParams());
 
-    expect(query.buildSqlAndParams()[0]).toMatch(/OFFSET (\d) LIMIT (\d)/);
+    expect(query.buildSqlAndParams()[0]).toMatch(/OFFSET (\d)\s+LIMIT (\d)/);
   });
 
   it('calculated join', async () => {
@@ -2535,6 +2710,9 @@ describe('SQL Generation', () => {
 
       const sqlBuild = query.buildSqlAndParams();
 
+      console.log(sqlBuild[0]);
+      console.log(sqlBuild[1]);
+
       expect(sqlBuild[0].includes('America/Los_Angeles')).toEqual(true);
       expect(sqlBuild[1][0]).toEqual(granularityTest.from);
       expect(sqlBuild[1][1]).toEqual(granularityTest.to);
diff --git a/packages/cubejs-schema-compiler/test/unit/cube-validator.test.ts b/packages/cubejs-schema-compiler/test/unit/cube-validator.test.ts
index 0f0fc75b51..7e03f95594 100644
--- a/packages/cubejs-schema-compiler/test/unit/cube-validator.test.ts
+++ b/packages/cubejs-schema-compiler/test/unit/cube-validator.test.ts
@@ -528,6 +528,7 @@ describe('Cube Validation', () => {
 
     const cubeSymbols = new CubeSymbols();
     cubeSymbols.compile([cubeA], {
+      // @ts-ignore
       inContext: () => false,
       error: (message, _e) => {
         console.log(message);
diff --git a/packages/cubejs-schema-compiler/test/unit/fixtures/folders.yml b/packages/cubejs-schema-compiler/test/unit/fixtures/folders.yml
index c033565865..6d07efb270 100644
--- a/packages/cubejs-schema-compiler/test/unit/fixtures/folders.yml
+++ b/packages/cubejs-schema-compiler/test/unit/fixtures/folders.yml
@@ -22,10 +22,6 @@ cubes:
       - name: status
         sql: status
         type: string
-
-      - name: city
-        sql: city
-        type: string
     hierarchies:
       - name: orders_hierarchy
         levels:
diff --git a/packages/cubejs-schema-compiler/test/unit/fixtures/hierarchies.yml b/packages/cubejs-schema-compiler/test/unit/fixtures/hierarchies.yml
index c7a4d7d49d..0adbfd5453 100644
--- a/packages/cubejs-schema-compiler/test/unit/fixtures/hierarchies.yml
+++ b/packages/cubejs-schema-compiler/test/unit/fixtures/hierarchies.yml
@@ -66,6 +66,8 @@ views:
         includes:
           - age
           - state
+          - name: city
+            alias: user_city
   - name: orders_includes_excludes_view
     cubes:
       - join_path: orders
@@ -85,5 +87,17 @@ views:
       - join_path: users
         prefix: true
         includes: "*"
-
-
+  - name: only_hierarchy_included_view
+    cubes:
+      - join_path: orders
+        includes:
+          - orders_hierarchy
+      - join_path: users
+        includes:
+          - city
+  - name: auto_include_view
+    cubes:
+      - join_path: orders
+        includes:
+          - orders_hierarchy
+          - some_other_hierarchy
diff --git a/packages/cubejs-schema-compiler/test/unit/hierarchies.test.ts b/packages/cubejs-schema-compiler/test/unit/hierarchies.test.ts
index 0dd190bba8..d4af9934cf 100644
--- a/packages/cubejs-schema-compiler/test/unit/hierarchies.test.ts
+++ b/packages/cubejs-schema-compiler/test/unit/hierarchies.test.ts
@@ -25,14 +25,15 @@ describe('Cube hierarchies', () => {
         public: true,
         levels: [
           'orders_users_view.status',
-          'orders_users_view.number'
+          'orders_users_view.number',
+          'orders_users_view.user_city'
         ],
       },
       {
         name: 'orders_users_view.some_other_hierarchy',
         public: true,
         title: 'Some other hierarchy',
-        levels: ['orders_users_view.state']
+        levels: ['orders_users_view.state', 'orders_users_view.user_city']
       }
     ]);
 
@@ -50,6 +51,44 @@ describe('Cube hierarchies', () => {
       (it) => it.config.name === 'all_hierarchy_view'
     );
     expect(allHierarchyView.config.hierarchies.length).toBe(3);
+
+    const prefixedHierarchy = allHierarchyView.config.hierarchies.find((it) => it.name === 'all_hierarchy_view.users_users_hierarchy');
+    expect(prefixedHierarchy).toBeTruthy();
+    expect(prefixedHierarchy?.levels).toEqual(['all_hierarchy_view.users_age', 'all_hierarchy_view.users_city']);
+  });
+
+  it('auto include hierarchy members', async () => {
+    const modelContent = fs.readFileSync(
+      path.join(process.cwd(), '/test/unit/fixtures/hierarchies.yml'),
+      'utf8'
+    );
+    const { compiler, metaTransformer } = prepareYamlCompiler(modelContent);
+
+    await compiler.compile();
+
+    const view1 = metaTransformer.cubes.find(
+      (it) => it.config.name === 'only_hierarchy_included_view'
+    );
+
+    expect(view1.config.dimensions).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ name: 'only_hierarchy_included_view.status' }),
+        expect.objectContaining({ name: 'only_hierarchy_included_view.number' }),
+        expect.objectContaining({ name: 'only_hierarchy_included_view.city' })
+      ])
+    );
+
+    // Members from the `users` cube are not included as `users` is not selected (not joined)
+    const view2 = metaTransformer.cubes.find(
+      (it) => it.config.name === 'auto_include_view'
+    );
+    expect(view2.config.dimensions.length).toEqual(2);
+    expect(view2.config.dimensions).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ name: 'auto_include_view.status' }),
+        expect.objectContaining({ name: 'auto_include_view.number' }),
+      ])
+    );
   });
 
   it(('hierarchy with measure'), async () => {
diff --git a/packages/cubejs-schema-compiler/test/unit/pre-agg-time-dim-match.test.ts b/packages/cubejs-schema-compiler/test/unit/pre-agg-time-dim-match.test.ts
index 83120f1564..32f644fdd6 100644
--- a/packages/cubejs-schema-compiler/test/unit/pre-agg-time-dim-match.test.ts
+++ b/packages/cubejs-schema-compiler/test/unit/pre-agg-time-dim-match.test.ts
@@ -16,7 +16,8 @@ describe('Pre Aggregation by filter match tests', () => {
         },
         one_week_by_sunday: {
           interval: '1 week',
-          offset: '-1 day'
+          // offset: '-1 day' // offsets might lead to flaky tests through years
+          origin: '2025-01-05 00:00:00'
         },
         two_weeks_by_1st_feb_00am: {
           interval: '2 weeks',
@@ -38,6 +39,8 @@ describe('Pre Aggregation by filter match tests', () => {
     preAggTimeGranularity: string,
     queryAggTimeGranularity: string,
     queryTimeZone: string = 'America/Los_Angeles',
+    dateRange: [ string, string ] = ['2017-01-01', '2017-03-31'],
+    allowNonStrictDateRangeMatch: boolean = false
   ) {
     const aaa: any = {
       type: 'rollup',
@@ -46,8 +49,7 @@ describe('Pre Aggregation by filter match tests', () => {
       timeDimension: 'cube.created',
       granularity: preAggTimeGranularity,
       partitionGranularity: 'year',
-      // Enabling only for custom granularities
-      allowNonStrictDateRangeMatch: !/^(minute|hour|day|week|month|quarter|year)$/.test(preAggTimeGranularity)
+      allowNonStrictDateRangeMatch
     };
 
     const cube: any = {
@@ -65,7 +67,7 @@ describe('Pre Aggregation by filter match tests', () => {
 
     // aaa.sortedDimensions = aaa.dimensions;
     // aaa.sortedDimensions.sort();
-    aaa.sortedTimeDimensions = [[aaa.timeDimension, aaa.granularity]];
+    aaa.sortedTimeDimensions = [[aaa.timeDimension, aaa.granularity, 'day']];
 
     return compiler.compile().then(() => {
       const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {
@@ -73,7 +75,7 @@ describe('Pre Aggregation by filter match tests', () => {
         timeDimensions: [{
           dimension: 'cube.created',
           granularity: queryAggTimeGranularity,
-          dateRange: { from: '2017-01-01', to: '2017-03-31' }
+          dateRange,
         }],
         timezone: queryTimeZone,
       });
@@ -92,15 +94,43 @@ describe('Pre Aggregation by filter match tests', () => {
   ));
 
   it('1 count measure, one_week_by_sunday, one_week_by_sunday', () => testPreAggregationMatch(
-    true, ['count'], 'one_week_by_sunday', 'one_week_by_sunday'
+    true,
+    ['count'],
+    'one_week_by_sunday',
+    'one_week_by_sunday',
+    'UTC',
+    ['2024-02-11', '2024-03-02']
   ));
 
-  it('1 count measure, two_weeks_by_1st_feb_00am, two_weeks_by_1st_feb_00am', () => testPreAggregationMatch(
-    true, ['count'], 'two_weeks_by_1st_feb_00am', 'two_weeks_by_1st_feb_00am'
+  it('1 count measure, one_week_by_sunday, one_week_by_sunday (dst)', () => testPreAggregationMatch(
+    true,
+    ['count'],
+    'one_week_by_sunday',
+    'one_week_by_sunday',
+    'America/Los_Angeles',
+    ['2024-02-25', '2024-03-30'], // DST Switch happens here, but still must work!
+  ));
+
+  it('1 count measure, two_weeks_by_1st_feb_00am, two_weeks_by_1st_feb_00am (match)', () => testPreAggregationMatch(
+    true,
+    ['count'],
+    'two_weeks_by_1st_feb_00am',
+    'two_weeks_by_1st_feb_00am',
+    'UTC',
+    ['2024-01-18', '2024-02-28']
+  ));
+
+  it('1 count measure, two_weeks_by_1st_feb_00am, two_weeks_by_1st_feb_00am (miss)', () => testPreAggregationMatch(
+    false,
+    ['count'],
+    'two_weeks_by_1st_feb_00am',
+    'two_weeks_by_1st_feb_00am',
+    'UTC',
+    ['2024-01-18', '2024-02-07'], // Interval not aligned
   ));
 
   it('1 count measure, day, one_week_by_sunday', () => testPreAggregationMatch(
-    true, ['count'], 'day', 'one_week_by_sunday'
+    true, ['count'], 'day', 'one_week_by_sunday', 'UTC'
   ));
 
   it('1 count measure, day, two_weeks_by_1st_feb_00am', () => testPreAggregationMatch(
diff --git a/packages/cubejs-schema-compiler/test/unit/transpilers.test.ts b/packages/cubejs-schema-compiler/test/unit/transpilers.test.ts
index 56a53ee3d0..30e48a8a2e 100644
--- a/packages/cubejs-schema-compiler/test/unit/transpilers.test.ts
+++ b/packages/cubejs-schema-compiler/test/unit/transpilers.test.ts
@@ -27,7 +27,7 @@ describe('Transpilers', () => {
 
       throw new Error('Compile should thrown an error');
     } catch (e: any) {
-      expect(e.message).toMatch(/Duplicate property parsing test1 in main.js/);
+      expect(e.message).toMatch(/Duplicate property parsing test1/);
     }
   });
 
diff --git a/packages/cubejs-server-core/CHANGELOG.md b/packages/cubejs-server-core/CHANGELOG.md
index 1323e9bdbb..10e0f0721c 100644
--- a/packages/cubejs-server-core/CHANGELOG.md
+++ b/packages/cubejs-server-core/CHANGELOG.md
@@ -3,6 +3,76 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+### Features
+
+- **server-core:** add fastReloadEnabled option to CompilerApi ([#9289](https://github.com/cube-js/cube/issues/9289)) ([122a3a3](https://github.com/cube-js/cube/commit/122a3a30e526f122d2bf2c0661f2b32fa070e824))
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/server-core
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+### Bug Fixes
+
+- **server-core:** Handle empty query in getSqlGenerator ([#9270](https://github.com/cube-js/cube/issues/9270)) ([350a438](https://github.com/cube-js/cube/commit/350a438d33d19ce77f33feb4f30910e3087d36e6))
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/server-core
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+### Features
+
+- **cubejs-server-core:** support proxy in http agent transport ([#9263](https://github.com/cube-js/cube/issues/9263)) ([89c74ce](https://github.com/cube-js/cube/commit/89c74cec2be96f63f51990b5eec59096749e967b))
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/server-core
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/server-core
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/server-core
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/server-core
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/server-core
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+### Features
+
+- **server-core:** Introduce CUBEJS_REFRESH_WORKER_CONCURRENCY env and update default concurrency settings for drivers ([#9168](https://github.com/cube-js/cube/issues/9168)) ([7ef6282](https://github.com/cube-js/cube/commit/7ef628273905d47996b108862a52dde89b9525e3))
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/server-core
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+### Features
+
+- **cubejs-server-core:** add contextToCubeStoreRouterId config option ([#9197](https://github.com/cube-js/cube/issues/9197)) ([6ee0e41](https://github.com/cube-js/cube/commit/6ee0e416761799acd064ad88241519ad2e1992f4))
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/server-core
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/server-core
+
 ## [1.1.18](https://github.com/cube-js/cube/compare/v1.1.17...v1.1.18) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/server-core
diff --git a/packages/cubejs-server-core/package.json b/packages/cubejs-server-core/package.json
index 0710a708eb..8af630ef07 100644
--- a/packages/cubejs-server-core/package.json
+++ b/packages/cubejs-server-core/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/server-core",
   "description": "Cube.js base component to wire all backend components together",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.18",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -29,17 +29,19 @@
     "unit": "jest --runInBand --forceExit --coverage dist/test"
   },
   "dependencies": {
-    "@cubejs-backend/api-gateway": "1.1.18",
-    "@cubejs-backend/cloud": "1.1.17",
+    "@cubejs-backend/api-gateway": "1.2.14",
+    "@cubejs-backend/cloud": "1.2.14",
     "@cubejs-backend/dotenv": "^9.0.2",
-    "@cubejs-backend/native": "1.1.17",
-    "@cubejs-backend/query-orchestrator": "1.1.17",
-    "@cubejs-backend/schema-compiler": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
-    "@cubejs-backend/templates": "1.1.17",
+    "@cubejs-backend/native": "1.2.14",
+    "@cubejs-backend/query-orchestrator": "1.2.14",
+    "@cubejs-backend/schema-compiler": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
+    "@cubejs-backend/templates": "1.2.14",
     "codesandbox-import-utils": "^2.1.12",
     "cross-spawn": "^7.0.1",
     "fs-extra": "^8.1.0",
+    "http-proxy-agent": "^7.0.2",
+    "https-proxy-agent": "^7.0.6",
     "is-docker": "^2.1.1",
     "joi": "^17.8.3",
     "jsonwebtoken": "^9.0.2",
@@ -57,9 +59,9 @@
     "ws": "^7.5.3"
   },
   "devDependencies": {
-    "@cubejs-backend/cubestore-driver": "1.1.17",
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-client/playground": "1.1.17",
+    "@cubejs-backend/cubestore-driver": "1.2.14",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-client/playground": "1.2.14",
     "@types/cross-spawn": "^6.0.2",
     "@types/express": "^4.17.21",
     "@types/fs-extra": "^9.0.8",
diff --git a/packages/cubejs-server-core/src/core/CompilerApi.js b/packages/cubejs-server-core/src/core/CompilerApi.js
index 45ae80dc68..04eabdfed2 100644
--- a/packages/cubejs-server-core/src/core/CompilerApi.js
+++ b/packages/cubejs-server-core/src/core/CompilerApi.js
@@ -1,7 +1,7 @@
 import crypto from 'crypto';
 import R from 'ramda';
 import { createQuery, compile, queryClass, PreAggregations, QueryFactory } from '@cubejs-backend/schema-compiler';
-import { v4 as uuidv4 } from 'uuid';
+import { v4 as uuidv4, parse as uuidParse, stringify as uuidStringify } from 'uuid';
 import { NativeInstance } from '@cubejs-backend/native';
 
 export class CompilerApi {
@@ -53,7 +53,7 @@ export class CompilerApi {
       compilerVersion = JSON.stringify(compilerVersion);
     }
 
-    if (this.options.devServer) {
+    if (this.options.devServer || this.options.fastReloadEnabled) {
       const files = await this.repository.dataSchemaFiles();
       compilerVersion += `_${crypto.createHash('md5').update(JSON.stringify(files)).digest('hex')}`;
     }
@@ -137,19 +137,26 @@ export class CompilerApi {
       throw new Error(`Unknown dbType: ${dbType}`);
     }
 
+    // sqlGenerator.dataSource can return undefined for query without members
+    // Queries like this are used by api-gateway to initialize SQL API
+    // At the same time, those queries should use concrete dataSource, so we should be good to go with it
     dataSource = compilers.compiler.withQuery(sqlGenerator, () => sqlGenerator.dataSource);
-    const _dbType = await this.getDbType(dataSource);
-    if (dataSource !== 'default' && dbType !== _dbType) {
-      // TODO consider more efficient way than instantiating query
-      sqlGenerator = await this.createQueryByDataSource(
-        compilers,
-        query,
-        dataSource,
-        _dbType
-      );
+    if (dataSource !== undefined) {
+      const _dbType = await this.getDbType(dataSource);
+      if (dataSource !== 'default' && dbType !== _dbType) {
+        // TODO consider more efficient way than instantiating query
+        sqlGenerator = await this.createQueryByDataSource(
+          compilers,
+          query,
+          dataSource,
+          _dbType
+        );
 
-      if (!sqlGenerator) {
-        throw new Error(`Can't find dialect for '${dataSource}' data source: ${_dbType}`);
+        if (!sqlGenerator) {
+          throw new Error(
+            `Can't find dialect for '${dataSource}' data source: ${_dbType}`
+          );
+        }
       }
     }
 
@@ -428,7 +435,7 @@ export class CompilerApi {
     const { cubeEvaluator } = compilers;
 
     if (!cubeEvaluator.isRbacEnabled()) {
-      return cubes;
+      return { cubes, visibilityMaskHash: null };
     }
 
     for (const cube of cubes) {
@@ -481,23 +488,38 @@ export class CompilerApi {
       });
     };
 
-    return cubes
-      .map((cube) => ({
-        config: {
-          ...cube.config,
-          measures: cube.config.measures?.map(visibilityPatcherForCube(cube)),
-          dimensions: cube.config.dimensions?.map(visibilityPatcherForCube(cube)),
-          segments: cube.config.segments?.map(visibilityPatcherForCube(cube)),
-          hierarchies: cube.config.hierarchies?.map(visibilityPatcherForCube(cube)),
-        },
-      }));
+    const visibiliyMask = JSON.stringify(isMemberVisibleInContext, Object.keys(isMemberVisibleInContext).sort());
+    // This hash will be returned along the modified meta config and can be used
+    // to distinguish between different "schema versions" after DAP visibility is applied
+    const visibilityMaskHash = crypto.createHash('sha256').update(visibiliyMask).digest('hex');
+
+    return {
+      cubes: cubes
+        .map((cube) => ({
+          config: {
+            ...cube.config,
+            measures: cube.config.measures?.map(visibilityPatcherForCube(cube)),
+            dimensions: cube.config.dimensions?.map(visibilityPatcherForCube(cube)),
+            segments: cube.config.segments?.map(visibilityPatcherForCube(cube)),
+            hierarchies: cube.config.hierarchies?.map(visibilityPatcherForCube(cube)),
+          },
+        })),
+      visibilityMaskHash
+    };
+  }
+
+  mixInVisibilityMaskHash(compilerId, visibilityMaskHash) {
+    const uuidBytes = uuidParse(compilerId);
+    const hashBytes = Buffer.from(visibilityMaskHash, 'hex');
+    return uuidv4({ random: crypto.createHash('sha256').update(uuidBytes).update(hashBytes).digest()
+      .subarray(0, 16) });
   }
 
   async metaConfig(requestContext, options = {}) {
     const { includeCompilerId, ...restOptions } = options;
     const compilers = await this.getCompilers(restOptions);
     const { cubes } = compilers.metaTransformer;
-    const patchedCubes = await this.patchVisibilityByAccessPolicy(
+    const { visibilityMaskHash, cubes: patchedCubes } = await this.patchVisibilityByAccessPolicy(
       compilers,
       requestContext,
       cubes
@@ -505,7 +527,11 @@ export class CompilerApi {
     if (includeCompilerId) {
       return {
         cubes: patchedCubes,
-        compilerId: compilers.compilerId,
+        // This compilerId is primarily used by the cubejs-backend-native or caching purposes.
+        // By default it doesn't account for member visibility changes introduced above by DAP.
+        // Here we're modifying the originila compilerId in a way that it's distinct for
+        // distinct schema versions while still being a valid UUID.
+        compilerId: visibilityMaskHash ? this.mixInVisibilityMaskHash(compilers.compilerId, visibilityMaskHash) : compilers.compilerId,
       };
     }
     return patchedCubes;
@@ -513,7 +539,7 @@ export class CompilerApi {
 
   async metaConfigExtended(requestContext, options) {
     const compilers = await this.getCompilers(options);
-    const patchedCubes = await this.patchVisibilityByAccessPolicy(
+    const { cubes: patchedCubes } = await this.patchVisibilityByAccessPolicy(
       compilers,
       requestContext,
       compilers.metaTransformer?.cubes
diff --git a/packages/cubejs-server-core/src/core/OptsHandler.ts b/packages/cubejs-server-core/src/core/OptsHandler.ts
index 55731d1aa0..c0d79990d9 100644
--- a/packages/cubejs-server-core/src/core/OptsHandler.ts
+++ b/packages/cubejs-server-core/src/core/OptsHandler.ts
@@ -287,6 +287,7 @@ export class OptsHandler {
   private queueOptionsWrapper(
     context: RequestContext,
     queueOptions: unknown | ((dataSource?: string) => QueueOptions),
+    queueType: 'query' | 'pre-aggs',
   ): (dataSource?: string) => Promise<QueueOptions> {
     return async (dataSource = 'default') => {
       const options = (
@@ -298,6 +299,14 @@ export class OptsHandler {
         // concurrency specified in cube.js
         return options;
       } else {
+        const workerConcurrency = getEnv('refreshWorkerConcurrency');
+        if (queueType === 'pre-aggs' && workerConcurrency) {
+          return {
+            ...options,
+            concurrency: workerConcurrency,
+          };
+        }
+
         const envConcurrency: number = getEnv('concurrency', { dataSource });
         if (envConcurrency) {
           // concurrency specified in CUBEJS_CONCURRENCY
@@ -320,7 +329,7 @@ export class OptsHandler {
           // no specified concurrency
           return {
             ...options,
-            concurrency: 2,
+            concurrency: 5,
           };
         }
       }
@@ -453,15 +462,12 @@ export class OptsHandler {
       externalDialectFactory,
       apiSecret: process.env.CUBEJS_API_SECRET,
       telemetry: getEnv('telemetry'),
-      scheduledRefreshTimeZones:
-        process.env.CUBEJS_SCHEDULED_REFRESH_TIMEZONES &&
-        process.env.CUBEJS_SCHEDULED_REFRESH_TIMEZONES.split(',').map(t => t.trim()),
+      scheduledRefreshTimeZones: getEnv('scheduledRefreshTimezones'),
       scheduledRefreshContexts: async () => [null],
       basePath: '/cubejs-api',
       dashboardAppPath: 'dashboard-app',
       dashboardAppPort: 3000,
-      scheduledRefreshConcurrency:
-        parseInt(process.env.CUBEJS_SCHEDULED_REFRESH_CONCURRENCY, 10),
+      scheduledRefreshConcurrency: getEnv('scheduledRefreshQueriesPerAppId'),
       scheduledRefreshBatchSize: getEnv('scheduledRefreshBatchSize'),
       preAggregationsSchema:
         getEnv('preAggregationsSchema') ||
@@ -662,6 +668,7 @@ export class OptsHandler {
     clone.queryCacheOptions.queueOptions = this.queueOptionsWrapper(
       context,
       clone.queryCacheOptions.queueOptions,
+      'query'
     );
 
     // pre-aggs queue options
@@ -669,6 +676,7 @@ export class OptsHandler {
     clone.preAggregationsOptions.queueOptions = this.queueOptionsWrapper(
       context,
       clone.preAggregationsOptions.queueOptions,
+      'pre-aggs'
     );
 
     // pre-aggs external refresh flag (force to run pre-aggs build flow first if
diff --git a/packages/cubejs-server-core/src/core/OrchestratorApi.ts b/packages/cubejs-server-core/src/core/OrchestratorApi.ts
index 90ba2fcb2d..4579923353 100644
--- a/packages/cubejs-server-core/src/core/OrchestratorApi.ts
+++ b/packages/cubejs-server-core/src/core/OrchestratorApi.ts
@@ -2,12 +2,12 @@
 import * as stream from 'stream';
 import pt from 'promise-timeout';
 import {
-  QueryOrchestrator,
   ContinueWaitError,
   DriverFactoryByDataSource,
   DriverType,
-  QueryOrchestratorOptions,
   QueryBody,
+  QueryOrchestrator,
+  QueryOrchestratorOptions,
 } from '@cubejs-backend/query-orchestrator';
 
 import { DatabaseType, RequestContext } from './types';
@@ -86,13 +86,13 @@ export class OrchestratorApi {
         : this.orchestrator.fetchQuery(query);
 
       if (query.isJob) {
-        // We want to immediately resolve and return a jobed build query result
+        // We want to immediately resolve and return a jobbed build query result
         // (initialized by the /cubejs-system/v1/pre-aggregations/jobs endpoint)
         // because the following stack was optimized for such behavior.
         const job = await fetchQueryPromise;
         return job;
       }
-      
+
       fetchQueryPromise = pt.timeout(fetchQueryPromise, this.continueWaitTimeout * 1000);
 
       const data = await fetchQueryPromise;
diff --git a/packages/cubejs-server-core/src/core/RefreshScheduler.ts b/packages/cubejs-server-core/src/core/RefreshScheduler.ts
index c79365f7d1..d6692b5838 100644
--- a/packages/cubejs-server-core/src/core/RefreshScheduler.ts
+++ b/packages/cubejs-server-core/src/core/RefreshScheduler.ts
@@ -147,7 +147,7 @@ export class RefreshScheduler {
     const orchestratorApi = await this.serverCore.getOrchestratorApi(context);
     const preAggregationsLoadCacheByDataSource = {};
 
-    // Return a empty array for cases with 2 same pre-aggregations but with different partitionGranularity
+    // Return an empty array for cases with 2 same pre-aggregations but with different partitionGranularity
     // Only the most detailed pre-aggregations will be use
     if (!preAggregationDescription) {
       return {
diff --git a/packages/cubejs-server-core/src/core/agentCollect.ts b/packages/cubejs-server-core/src/core/agentCollect.ts
index 4235257e8c..be7b226b5c 100644
--- a/packages/cubejs-server-core/src/core/agentCollect.ts
+++ b/packages/cubejs-server-core/src/core/agentCollect.ts
@@ -1,6 +1,8 @@
 import { getEnv } from '@cubejs-backend/shared';
 import http from 'http';
 import https from 'https';
+import { HttpsProxyAgent } from 'https-proxy-agent';
+import { HttpProxyAgent } from 'http-proxy-agent';
 import fetch from 'node-fetch';
 import crypto from 'crypto';
 import WebSocket from 'ws';
@@ -50,12 +52,12 @@ class WebSocketTransport implements AgentTransport {
       clearTimeout(this.pingTimeout);
       this.onClose();
     });
-  
+
     this.wsClient.on('error', e => {
       connectionPromiseReject(e);
       this.logger('Agent Error', { error: (e.stack || e).toString() });
     });
-  
+
     this.wsClient.on('message', (data: WebSocket.Data) => {
       try {
         const { method, params } = JSON.parse(data.toString());
@@ -103,17 +105,45 @@ class WebSocketTransport implements AgentTransport {
   }
 }
 
+function isOnNoProxyList(url: string): boolean {
+  const noProxy = process.env.NO_PROXY || process.env.no_proxy;
+  if (!noProxy) {
+    return false;
+  }
+
+  const parsedUrl = new URL(url);
+  const { hostname } = parsedUrl;
+  const noProxyList = noProxy.split(',').map((entry) => entry.trim());
+
+  return noProxyList.some((entry) => {
+    if (entry === '*') {
+      return true;
+    }
+    if (entry.startsWith('.')) {
+      return hostname.endsWith(entry);
+    }
+
+    return hostname === entry;
+  });
+}
+
 class HttpTransport implements AgentTransport {
-  private agent: http.Agent | https.Agent;
+  private agent: http.Agent | https.Agent | HttpProxyAgent<string> | HttpsProxyAgent<string>;
 
   public constructor(
     private readonly endpointUrl: string
   ) {
-    const AgentClass = endpointUrl.startsWith('https') ? https.Agent : http.Agent;
-    this.agent = new AgentClass({
+    const agentParams = {
       keepAlive: true,
       maxSockets: getEnv('agentMaxSockets')
-    });
+    };
+    if (!isOnNoProxyList(endpointUrl) && (process.env.http_proxy || process.env.https_proxy)) {
+      this.agent = endpointUrl.startsWith('https') ?
+        new HttpsProxyAgent(process.env.https_proxy, agentParams) :
+        new HttpProxyAgent(process.env.http_proxy, agentParams);
+    } else {
+      this.agent = endpointUrl.startsWith('https') ? new https.Agent(agentParams) : new http.Agent(agentParams);
+    }
   }
 
   public ready() {
@@ -167,7 +197,7 @@ export default async (event: Record<string, any>, endpointUrl: string, logger: a
       const sentAt = new Date().toJSON();
       const result = await transport.send(toFlush.map(r => ({ ...r, sentAt })));
       if (!result && retries > 0) return flush(toFlush, retries - 1);
-  
+
       return true;
     } catch (e: any) {
       if (retries > 0) return flush(toFlush, retries - 1);
diff --git a/packages/cubejs-server-core/src/core/optionsValidate.ts b/packages/cubejs-server-core/src/core/optionsValidate.ts
index 40c147da8a..efe39bf424 100644
--- a/packages/cubejs-server-core/src/core/optionsValidate.ts
+++ b/packages/cubejs-server-core/src/core/optionsValidate.ts
@@ -74,6 +74,7 @@ const schemaOptions = Joi.object().keys({
   contextToAppId: Joi.func(),
   contextToRoles: Joi.func(),
   contextToOrchestratorId: Joi.func(),
+  contextToCubeStoreRouterId: Joi.func(),
   contextToDataSourceId: Joi.func(),
   contextToApiScopes: Joi.func(),
   repositoryFactory: Joi.func(),
diff --git a/packages/cubejs-server-core/src/core/server.ts b/packages/cubejs-server-core/src/core/server.ts
index c50988ebb0..5f44f0adf9 100644
--- a/packages/cubejs-server-core/src/core/server.ts
+++ b/packages/cubejs-server-core/src/core/server.ts
@@ -59,6 +59,7 @@ import type {
   LoggerFn,
   DriverConfig,
   ScheduledRefreshTimeZonesFn,
+  ContextToCubeStoreRouterIdFn,
 } from './types';
 import {
   ContextToOrchestratorIdFn,
@@ -137,6 +138,8 @@ export class CubejsServerCore {
 
   protected readonly contextToOrchestratorId: ContextToOrchestratorIdFn;
 
+  protected readonly contextToCubeStoreRouterId: ContextToCubeStoreRouterIdFn | null;
+
   protected readonly preAggregationsSchema: PreAggregationsSchemaFn;
 
   protected readonly scheduledRefreshTimeZones: ScheduledRefreshTimeZonesFn;
@@ -216,6 +219,7 @@ export class CubejsServerCore {
     }
 
     this.contextToOrchestratorId = this.options.contextToOrchestratorId || (() => 'STANDALONE');
+    this.contextToCubeStoreRouterId = this.options.contextToCubeStoreRouterId;
 
     // proactively free up old cache values occasionally
     if (this.options.maxCompilerCacheKeepAlive) {
@@ -708,6 +712,7 @@ export class CubejsServerCore {
         sqlCache: this.options.sqlCache,
         standalone: this.standalone,
         allowNodeRequire: options.allowNodeRequire,
+        fastReloadEnabled: options.fastReloadEnabled || getEnv('fastReloadEnabled'),
       },
     );
   }
diff --git a/packages/cubejs-server-core/src/core/types.ts b/packages/cubejs-server-core/src/core/types.ts
index d639e2664c..73cdbdd818 100644
--- a/packages/cubejs-server-core/src/core/types.ts
+++ b/packages/cubejs-server-core/src/core/types.ts
@@ -123,6 +123,7 @@ export type DatabaseType =
 export type ContextToAppIdFn = (context: RequestContext) => string | Promise<string>;
 export type ContextToRolesFn = (context: RequestContext) => string[] | Promise<string[]>;
 export type ContextToOrchestratorIdFn = (context: RequestContext) => string | Promise<string>;
+export type ContextToCubeStoreRouterIdFn = (context: RequestContext) => string | Promise<string>;
 
 export type OrchestratorOptionsFn = (context: RequestContext) => OrchestratorOptions | Promise<OrchestratorOptions>;
 
@@ -190,6 +191,7 @@ export interface CreateOptions {
   contextToAppId?: ContextToAppIdFn;
   contextToRoles?: ContextToRolesFn;
   contextToOrchestratorId?: ContextToOrchestratorIdFn;
+  contextToCubeStoreRouterId?: ContextToCubeStoreRouterIdFn;
   contextToApiScopes?: ContextToApiScopesFn;
   repositoryFactory?: (context: RequestContext) => SchemaFileRepository;
   checkAuth?: CheckAuthFn;
diff --git a/packages/cubejs-server-core/test/unit/OptsHandler.test.ts b/packages/cubejs-server-core/test/unit/OptsHandler.test.ts
index 3d37757679..306b810192 100644
--- a/packages/cubejs-server-core/test/unit/OptsHandler.test.ts
+++ b/packages/cubejs-server-core/test/unit/OptsHandler.test.ts
@@ -525,13 +525,13 @@ describe('OptsHandler class', () => {
       expect(opts.queryCacheOptions.queueOptions).toBeDefined();
       expect(typeof opts.queryCacheOptions.queueOptions).toEqual('function');
       expect(await opts.queryCacheOptions.queueOptions()).toEqual({
-        concurrency: 2,
+        concurrency: 5,
       });
 
       expect(opts.preAggregationsOptions.queueOptions).toBeDefined();
       expect(typeof opts.preAggregationsOptions.queueOptions).toEqual('function');
       expect(await opts.preAggregationsOptions.queueOptions()).toEqual({
-        concurrency: 2,
+        concurrency: 5,
       });
     }
   );
@@ -555,13 +555,13 @@ describe('OptsHandler class', () => {
       expect(opts.queryCacheOptions.queueOptions).toBeDefined();
       expect(typeof opts.queryCacheOptions.queueOptions).toEqual('function');
       expect(await opts.queryCacheOptions.queueOptions()).toEqual({
-        concurrency: 2,
+        concurrency: 5,
       });
 
       expect(opts.preAggregationsOptions.queueOptions).toBeDefined();
       expect(typeof opts.preAggregationsOptions.queueOptions).toEqual('function');
       expect(await opts.preAggregationsOptions.queueOptions()).toEqual({
-        concurrency: 2,
+        concurrency: 5,
       });
     }
   );
@@ -585,13 +585,13 @@ describe('OptsHandler class', () => {
       expect(opts.queryCacheOptions.queueOptions).toBeDefined();
       expect(typeof opts.queryCacheOptions.queueOptions).toEqual('function');
       expect(await opts.queryCacheOptions.queueOptions()).toEqual({
-        concurrency: 2,
+        concurrency: 5,
       });
 
       expect(opts.preAggregationsOptions.queueOptions).toBeDefined();
       expect(typeof opts.preAggregationsOptions.queueOptions).toEqual('function');
       expect(await opts.preAggregationsOptions.queueOptions()).toEqual({
-        concurrency: 2,
+        concurrency: 5,
       });
     }
   );
@@ -658,6 +658,41 @@ describe('OptsHandler class', () => {
     }
   );
 
+  test(
+    'must configure queueOptions with empty orchestratorOptions function, ' +
+    'with CUBEJS_REFRESH_WORKER_CONCURRENCY, CUBEJS_CONCURRENCY and with default driver concurrency',
+    async () => {
+      process.env.CUBEJS_CONCURRENCY = '11';
+      process.env.CUBEJS_REFRESH_WORKER_CONCURRENCY = '22';
+      process.env.CUBEJS_DB_TYPE = 'postgres';
+
+      const core = new CubejsServerCoreExposed({
+        ...conf,
+        dbType: undefined,
+        driverFactory: () => ({ type: <DatabaseType>process.env.CUBEJS_DB_TYPE }),
+        orchestratorOptions: () => ({}),
+      });
+
+      const opts = (<any> await core.getOrchestratorApi(<RequestContext>{})).options;
+
+      expect(opts.queryCacheOptions.queueOptions).toBeDefined();
+      expect(typeof opts.queryCacheOptions.queueOptions).toEqual('function');
+      expect(await opts.queryCacheOptions.queueOptions()).toEqual({
+        concurrency: parseInt(process.env.CUBEJS_CONCURRENCY, 10),
+      });
+
+      expect(opts.preAggregationsOptions.queueOptions).toBeDefined();
+      expect(typeof opts.preAggregationsOptions.queueOptions).toEqual('function');
+      expect(await opts.preAggregationsOptions.queueOptions()).toEqual({
+        concurrency: parseInt(process.env.CUBEJS_REFRESH_WORKER_CONCURRENCY, 10),
+      });
+
+      delete process.env.CUBEJS_CONCURRENCY;
+      delete process.env.CUBEJS_REFRESH_WORKER_CONCURRENCY;
+      delete process.env.CUBEJS_DB_TYPE;
+    }
+  );
+
   test(
     'multi data source concurrency',
     async () => {
diff --git a/packages/cubejs-server/CHANGELOG.md b/packages/cubejs-server/CHANGELOG.md
index c40eb9f390..9bed6d42cf 100644
--- a/packages/cubejs-server/CHANGELOG.md
+++ b/packages/cubejs-server/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
 ## [1.1.18](https://github.com/cube-js/cube/compare/v1.1.17...v1.1.18) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/server
diff --git a/packages/cubejs-server/examples/simple-mysql/package.json b/packages/cubejs-server/examples/simple-mysql/package.json
index ff7ea20f8c..82b069f2b3 100644
--- a/packages/cubejs-server/examples/simple-mysql/package.json
+++ b/packages/cubejs-server/examples/simple-mysql/package.json
@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "eslint": "^4.14.0",
-    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-node": "^10.0.0",
     "mocha": "^5.2.0",
     "should": "^13.2.3"
   },
diff --git a/packages/cubejs-server/examples/simple-postgres/package.json b/packages/cubejs-server/examples/simple-postgres/package.json
index 4363615a83..29f5bfcafb 100644
--- a/packages/cubejs-server/examples/simple-postgres/package.json
+++ b/packages/cubejs-server/examples/simple-postgres/package.json
@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "eslint": "^4.14.0",
-    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-node": "^10.0.0",
     "mocha": "^5.2.0",
     "should": "^13.2.3"
   },
diff --git a/packages/cubejs-server/package.json b/packages/cubejs-server/package.json
index 181c1096bf..38ee71ce6d 100644
--- a/packages/cubejs-server/package.json
+++ b/packages/cubejs-server/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/server",
   "description": "Cube.js all-in-one server",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.18",
+  "version": "1.2.14",
   "types": "index.d.ts",
   "repository": {
     "type": "git",
@@ -40,11 +40,11 @@
     "jest:shapshot": "jest --updateSnapshot test"
   },
   "dependencies": {
-    "@cubejs-backend/cubestore-driver": "1.1.17",
+    "@cubejs-backend/cubestore-driver": "1.2.14",
     "@cubejs-backend/dotenv": "^9.0.2",
-    "@cubejs-backend/native": "1.1.17",
-    "@cubejs-backend/server-core": "1.1.18",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/native": "1.2.14",
+    "@cubejs-backend/server-core": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "@oclif/color": "^1.0.0",
     "@oclif/command": "^1.8.13",
     "@oclif/config": "^1.18.2",
@@ -61,8 +61,8 @@
     "ws": "^7.1.2"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/query-orchestrator": "1.1.17",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/query-orchestrator": "1.2.14",
     "@oclif/dev-cli": "^1.23.1",
     "@types/body-parser": "^1.19.0",
     "@types/cors": "^2.8.8",
diff --git a/packages/cubejs-snowflake-driver/CHANGELOG.md b/packages/cubejs-snowflake-driver/CHANGELOG.md
index 35d05e7ae1..5fb14fec5d 100644
--- a/packages/cubejs-snowflake-driver/CHANGELOG.md
+++ b/packages/cubejs-snowflake-driver/CHANGELOG.md
@@ -3,6 +3,70 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/snowflake-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/snowflake-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/snowflake-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/snowflake-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/snowflake-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/snowflake-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/snowflake-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/snowflake-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/snowflake-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/snowflake-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+### Features
+
+- **server-core:** Introduce CUBEJS_REFRESH_WORKER_CONCURRENCY env and update default concurrency settings for drivers ([#9168](https://github.com/cube-js/cube/issues/9168)) ([7ef6282](https://github.com/cube-js/cube/commit/7ef628273905d47996b108862a52dde89b9525e3))
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/snowflake-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/snowflake-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/snowflake-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+### Features
+
+- **snowflake-driver:** set QUOTED_IDENTIFIERS_IGNORE_CASE=FALSE by default ([#9172](https://github.com/cube-js/cube/issues/9172)) ([164b783](https://github.com/cube-js/cube/commit/164b783843efa93ac8ca422634e5b6daccd91883))
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Features
diff --git a/packages/cubejs-snowflake-driver/package.json b/packages/cubejs-snowflake-driver/package.json
index d0fc47be3f..bd874f2474 100644
--- a/packages/cubejs-snowflake-driver/package.json
+++ b/packages/cubejs-snowflake-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/snowflake-driver",
   "description": "Cube.js Snowflake database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -25,8 +25,8 @@
     "lint:fix": "eslint --fix src/* --ext .ts"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "date-fns-timezone": "^0.1.4",
     "snowflake-sdk": "^1.13.1"
   },
@@ -38,7 +38,7 @@
     "extends": "../cubejs-linter"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "typescript": "~5.2.2"
   }
 }
diff --git a/packages/cubejs-snowflake-driver/src/SnowflakeDriver.ts b/packages/cubejs-snowflake-driver/src/SnowflakeDriver.ts
index b8422155af..8561e24b20 100644
--- a/packages/cubejs-snowflake-driver/src/SnowflakeDriver.ts
+++ b/packages/cubejs-snowflake-driver/src/SnowflakeDriver.ts
@@ -195,7 +195,7 @@ export class SnowflakeDriver extends BaseDriver implements DriverInterface {
    * Returns default concurrency value.
    */
   public static getDefaultConcurrency(): number {
-    return 5;
+    return 8;
   }
 
   public static driverEnvVariables() {
diff --git a/packages/cubejs-sqlite-driver/CHANGELOG.md b/packages/cubejs-sqlite-driver/CHANGELOG.md
index e164faa41d..f9dea76af0 100644
--- a/packages/cubejs-sqlite-driver/CHANGELOG.md
+++ b/packages/cubejs-sqlite-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/sqlite-driver
diff --git a/packages/cubejs-sqlite-driver/package.json b/packages/cubejs-sqlite-driver/package.json
index 0f19515ab4..0065e08774 100644
--- a/packages/cubejs-sqlite-driver/package.json
+++ b/packages/cubejs-sqlite-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/sqlite-driver",
   "description": "Cube.js Sqlite database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -17,13 +17,13 @@
     "lint": "eslint **/*.js"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "sqlite3": "^5.1.7"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0"
+    "@cubejs-backend/linter": "1.2.14"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/cubejs-templates/CHANGELOG.md b/packages/cubejs-templates/CHANGELOG.md
index d562a79bfb..35a2b5adfc 100644
--- a/packages/cubejs-templates/CHANGELOG.md
+++ b/packages/cubejs-templates/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
+## [1.2.4](/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/templates
diff --git a/packages/cubejs-templates/package.json b/packages/cubejs-templates/package.json
index fadb2a205d..c23a22bfc5 100644
--- a/packages/cubejs-templates/package.json
+++ b/packages/cubejs-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-backend/templates",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "description": "Cube.js Templates helpers",
   "author": "Cube Dev, Inc.",
   "license": "Apache-2.0",
@@ -26,7 +26,7 @@
     "extends": "../cubejs-linter"
   },
   "dependencies": {
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/shared": "1.2.14",
     "cross-spawn": "^7.0.3",
     "decompress": "^4.2.1",
     "decompress-targz": "^4.1.1",
@@ -36,7 +36,7 @@
     "source-map-support": "^0.5.19"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "typescript": "~5.2.2"
   }
 }
diff --git a/packages/cubejs-testing-drivers/CHANGELOG.md b/packages/cubejs-testing-drivers/CHANGELOG.md
index 960939a78d..5e599787d1 100644
--- a/packages/cubejs-testing-drivers/CHANGELOG.md
+++ b/packages/cubejs-testing-drivers/CHANGELOG.md
@@ -3,6 +3,68 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+### Bug Fixes
+
+- **redshift-driver:** Fix empty tableColumnTypes for external (Spectrum) tables ([#9251](https://github.com/cube-js/cube/issues/9251)) ([fa318a1](https://github.com/cube-js/cube/commit/fa318a144ed6ef484e2ac101cd71ab6ab6ca7abf))
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
+## [1.2.4](/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
 ## [1.1.18](https://github.com/cube-js/cube/compare/v1.1.17...v1.1.18) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/testing-drivers
diff --git a/packages/cubejs-testing-drivers/package.json b/packages/cubejs-testing-drivers/package.json
index 8849404d44..8491f15700 100644
--- a/packages/cubejs-testing-drivers/package.json
+++ b/packages/cubejs-testing-drivers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-backend/testing-drivers",
-  "version": "1.1.18",
+  "version": "1.2.14",
   "description": "Cube.js drivers test suite",
   "author": "Cube Dev, Inc.",
   "license": "MIT",
@@ -56,24 +56,24 @@
     "dist/src"
   ],
   "dependencies": {
-    "@cubejs-backend/athena-driver": "1.1.17",
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/bigquery-driver": "1.1.17",
-    "@cubejs-backend/clickhouse-driver": "1.1.17",
-    "@cubejs-backend/cubestore-driver": "1.1.17",
-    "@cubejs-backend/databricks-jdbc-driver": "1.1.17",
+    "@cubejs-backend/athena-driver": "1.2.14",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/bigquery-driver": "1.2.14",
+    "@cubejs-backend/clickhouse-driver": "1.2.14",
+    "@cubejs-backend/cubestore-driver": "1.2.14",
+    "@cubejs-backend/databricks-jdbc-driver": "1.2.14",
     "@cubejs-backend/dotenv": "^9.0.2",
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/mssql-driver": "1.1.17",
-    "@cubejs-backend/mysql-driver": "1.1.17",
-    "@cubejs-backend/postgres-driver": "1.1.17",
-    "@cubejs-backend/query-orchestrator": "1.1.17",
-    "@cubejs-backend/server-core": "1.1.18",
-    "@cubejs-backend/shared": "1.1.17",
-    "@cubejs-backend/snowflake-driver": "1.1.17",
-    "@cubejs-backend/testing-shared": "1.1.17",
-    "@cubejs-client/core": "1.1.12",
-    "@cubejs-client/ws-transport": "1.1.16",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/mssql-driver": "1.2.14",
+    "@cubejs-backend/mysql-driver": "1.2.14",
+    "@cubejs-backend/postgres-driver": "1.2.14",
+    "@cubejs-backend/query-orchestrator": "1.2.14",
+    "@cubejs-backend/server-core": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
+    "@cubejs-backend/snowflake-driver": "1.2.14",
+    "@cubejs-backend/testing-shared": "1.2.14",
+    "@cubejs-client/core": "1.2.14",
+    "@cubejs-client/ws-transport": "1.2.14",
     "@jest/globals": "^27",
     "@types/jest": "^27",
     "@types/node": "^18",
diff --git a/packages/cubejs-testing-drivers/src/tests/testExternalSchemas.ts b/packages/cubejs-testing-drivers/src/tests/testExternalSchemas.ts
index 9d063ab400..f5951a81d9 100644
--- a/packages/cubejs-testing-drivers/src/tests/testExternalSchemas.ts
+++ b/packages/cubejs-testing-drivers/src/tests/testExternalSchemas.ts
@@ -46,4 +46,16 @@ export function redshiftExternalSchemasSuite(
       expect(it.data_type).toEqual(expect.any(String));
     });
   });
+
+  execute('should load columns types for external table', async () => {
+    const columnsForTables = await driver().tableColumnTypes(`${EXTERNAL_SCHEMA}.${EXTERNAL_TABLE}`);
+
+    expect(columnsForTables).toBeInstanceOf(Array);
+    expect(columnsForTables.length).toBeGreaterThan(0);
+
+    columnsForTables.forEach((it) => {
+      expect(it.name).toEqual(expect.any(String));
+      expect(it.type).toEqual(expect.any(String));
+    });
+  });
 }
diff --git a/packages/cubejs-testing-shared/CHANGELOG.md b/packages/cubejs-testing-shared/CHANGELOG.md
index 32b9276984..95d289cc1b 100644
--- a/packages/cubejs-testing-shared/CHANGELOG.md
+++ b/packages/cubejs-testing-shared/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
+## [1.2.4](/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/testing-shared
diff --git a/packages/cubejs-testing-shared/package.json b/packages/cubejs-testing-shared/package.json
index fd683cb8f0..c9b39c58bc 100644
--- a/packages/cubejs-testing-shared/package.json
+++ b/packages/cubejs-testing-shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-backend/testing-shared",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "description": "Cube.js Testing Helpers",
   "author": "Cube Dev, Inc.",
   "license": "Apache-2.0",
@@ -21,16 +21,16 @@
   ],
   "dependencies": {
     "@cubejs-backend/dotenv": "^9.0.2",
-    "@cubejs-backend/query-orchestrator": "1.1.17",
-    "@cubejs-backend/schema-compiler": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/query-orchestrator": "1.2.14",
+    "@cubejs-backend/schema-compiler": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "@testcontainers/kafka": "~10.13.0",
     "dedent": "^0.7.0",
     "node-fetch": "^2.6.7",
     "testcontainers": "^10.13.0"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@jest/globals": "^27",
     "@types/dedent": "^0.7.0",
     "@types/jest": "^27",
diff --git a/packages/cubejs-testing/CHANGELOG.md b/packages/cubejs-testing/CHANGELOG.md
index 685155c3b8..a0b419ee45 100644
--- a/packages/cubejs-testing/CHANGELOG.md
+++ b/packages/cubejs-testing/CHANGELOG.md
@@ -3,6 +3,80 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/testing
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/testing
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+### Bug Fixes
+
+- **server-core:** Handle empty query in getSqlGenerator ([#9270](https://github.com/cube-js/cube/issues/9270)) ([350a438](https://github.com/cube-js/cube/commit/350a438d33d19ce77f33feb4f30910e3087d36e6))
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+### Bug Fixes
+
+- **cubesql:** Generate proper projection wrapper for duplicated members in CubeScanNode ([#9233](https://github.com/cube-js/cube/issues/9233)) ([aba6430](https://github.com/cube-js/cube/commit/aba643082acc440cf5b3fe9828c2c38ac1a833c9))
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/testing
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/testing
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/testing
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/testing
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+### Bug Fixes
+
+- **api-gateway:** Fix CompareDateRange queries native transformations ([#9232](https://github.com/cube-js/cube/issues/9232)) ([9c6153d](https://github.com/cube-js/cube/commit/9c6153d1e958e42162acb5af5964e9792a7f0433))
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/testing
+
+## [1.2.4](/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/testing
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/testing
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+### Bug Fixes
+
+- **testing:** avoid cypress crashes ([#9196](https://github.com/cube-js/cube/issues/9196)) ([364d181](https://github.com/cube-js/cube/commit/364d1812d5b3aff85bfbfbb82f6d8d2217d8a4ab))
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/testing
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+### Bug Fixes
+
+- **schema-compiler:** make sure view members are resolvable in DAP ([#9059](https://github.com/cube-js/cube/issues/9059)) ([e7b992e](https://github.com/cube-js/cube/commit/e7b992effb6ef90883d059280270c92d903607d4))
+
+### Features
+
+- Support complex join conditions for grouped joins ([#9157](https://github.com/cube-js/cube/issues/9157)) ([28c1e3b](https://github.com/cube-js/cube/commit/28c1e3bba7a100f3152bfdefd86197e818fac941))
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/testing
diff --git a/packages/cubejs-testing/birdbox-fixtures/rbac-python/model/views/users_view.yaml b/packages/cubejs-testing/birdbox-fixtures/rbac-python/model/views/users_view.yaml
new file mode 100644
index 0000000000..0163cc4e83
--- /dev/null
+++ b/packages/cubejs-testing/birdbox-fixtures/rbac-python/model/views/users_view.yaml
@@ -0,0 +1,13 @@
+views:
+  - name: users_view
+    cubes:
+      - join_path: users
+        includes: "*"
+
+    access_policy:
+      - role: '*'
+        row_level:
+          filters:
+            - member: id
+              operator: gt
+              values: [10]
diff --git a/packages/cubejs-testing/birdbox-fixtures/rbac/cube.js b/packages/cubejs-testing/birdbox-fixtures/rbac/cube.js
index e7c82f455e..6f50f842c9 100644
--- a/packages/cubejs-testing/birdbox-fixtures/rbac/cube.js
+++ b/packages/cubejs-testing/birdbox-fixtures/rbac/cube.js
@@ -1,5 +1,6 @@
 module.exports = {
   contextToRoles: async (context) => context.securityContext.auth?.roles || [],
+  canSwitchSqlUser: async () => true,
   checkSqlAuth: async (req, user, password) => {
     if (user === 'admin') {
       if (password && password !== 'admin_password') {
@@ -64,6 +65,27 @@ module.exports = {
         },
       };
     }
+    if (user === 'restricted') {
+      if (password && password !== 'restricted_password') {
+        throw new Error(`Password doesn't match for ${user}`);
+      }
+      return {
+        password,
+        superuser: false,
+        securityContext: {
+          auth: {
+            username: 'default',
+            userAttributes: {
+              region: 'CA',
+              city: 'San Francisco',
+              canHaveAdmin: true,
+              minDefaultId: 20000,
+            },
+            roles: ['restricted'],
+          },
+        },
+      };
+    }
     throw new Error(`User "${user}" doesn't exist`);
   }
 };
diff --git a/packages/cubejs-testing/birdbox-fixtures/rbac/model/cubes/line_items.js b/packages/cubejs-testing/birdbox-fixtures/rbac/model/cubes/line_items.js
index 7013052b01..8d35089fdb 100644
--- a/packages/cubejs-testing/birdbox-fixtures/rbac/model/cubes/line_items.js
+++ b/packages/cubejs-testing/birdbox-fixtures/rbac/model/cubes/line_items.js
@@ -60,6 +60,12 @@ cube('line_items', {
         excludes: ['count', 'price', 'price_dim'],
       },
     },
+    {
+      role: 'restricted',
+      memberLevel: {
+        excludes: ['count', 'price', 'price_dim'],
+      },
+    },
     {
       role: 'admin',
       conditions: [
diff --git a/packages/cubejs-testing/birdbox-fixtures/rbac/model/views/users.js b/packages/cubejs-testing/birdbox-fixtures/rbac/model/views/users.js
new file mode 100644
index 0000000000..1c9488769f
--- /dev/null
+++ b/packages/cubejs-testing/birdbox-fixtures/rbac/model/views/users.js
@@ -0,0 +1,16 @@
+view('users_view', {
+  cubes: [{
+    join_path: users,
+    includes: '*',
+  }],
+  accessPolicy: [{
+    role: '*',
+    rowLevel: {
+      filters: [{
+        member: 'id',
+        operator: 'gt',
+        values: [10],
+      }],
+    },
+  }]
+});
diff --git a/packages/cubejs-testing/cypress/e2e/rollup-designer.js b/packages/cubejs-testing/cypress/e2e/rollup-designer.js
index bc24391abd..40f56be1f2 100644
--- a/packages/cubejs-testing/cypress/e2e/rollup-designer.js
+++ b/packages/cubejs-testing/cypress/e2e/rollup-designer.js
@@ -62,8 +62,14 @@ context("Playground: Rollup Designer", () => {
       cy.getByTestId("prism-code").should("contain.text", "main: ");
       cy.getByTestId("rd-input-every").clear().type("3");
       cy.getByTestId("rd-select-every-granularity")
+        // This crazy chain of commands is needed to avoid crashing
         .find("input")
-        .type("Day{enter}", { force: true });
+        .focus({ force: true })
+        .wait(500)
+        .click({ force: true })
+        .wait(500)
+        .type("Day{enter}", { force: true })
+        .wait(500);
       cy.getByTestId("prism-code").should("contain.text", "every: `3 day`");
       cy.getByTestId("rd-add-btn")
         .should("be.visible")
diff --git a/packages/cubejs-testing/package.json b/packages/cubejs-testing/package.json
index 4cc20d4d03..5feebd1cf7 100644
--- a/packages/cubejs-testing/package.json
+++ b/packages/cubejs-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-backend/testing",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "description": "Cube.js e2e tests",
   "author": "Cube Dev, Inc.",
   "license": "Apache-2.0",
@@ -94,15 +94,15 @@
     "birdbox-fixtures"
   ],
   "dependencies": {
-    "@cubejs-backend/cubestore-driver": "1.1.17",
+    "@cubejs-backend/cubestore-driver": "1.2.14",
     "@cubejs-backend/dotenv": "^9.0.2",
-    "@cubejs-backend/ksql-driver": "1.1.17",
-    "@cubejs-backend/postgres-driver": "1.1.17",
-    "@cubejs-backend/query-orchestrator": "1.1.17",
-    "@cubejs-backend/schema-compiler": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
-    "@cubejs-backend/testing-shared": "1.1.17",
-    "@cubejs-client/ws-transport": "1.1.16",
+    "@cubejs-backend/ksql-driver": "1.2.14",
+    "@cubejs-backend/postgres-driver": "1.2.14",
+    "@cubejs-backend/query-orchestrator": "1.2.14",
+    "@cubejs-backend/schema-compiler": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
+    "@cubejs-backend/testing-shared": "1.2.14",
+    "@cubejs-client/ws-transport": "1.2.14",
     "dedent": "^0.7.0",
     "fs-extra": "^8.1.0",
     "http-proxy": "^1.18.1",
@@ -113,8 +113,8 @@
   },
   "devDependencies": {
     "@4tw/cypress-drag-drop": "^1.6.0",
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-client/core": "1.1.12",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-client/core": "1.2.14",
     "@jest/globals": "^27",
     "@types/dedent": "^0.7.0",
     "@types/http-proxy": "^1.17.5",
diff --git a/packages/cubejs-testing/test/__snapshots__/smoke-cubesql.test.ts.snap b/packages/cubejs-testing/test/__snapshots__/smoke-cubesql.test.ts.snap
index 969d2d139e..4401d87097 100644
--- a/packages/cubejs-testing/test/__snapshots__/smoke-cubesql.test.ts.snap
+++ b/packages/cubejs-testing/test/__snapshots__/smoke-cubesql.test.ts.snap
@@ -378,3 +378,13 @@ Array [
   },
 ]
 `;
+
+exports[`SQL API Postgres (Data) wrapper with duplicated members: wrapper-duplicated-members 1`] = `
+Array [
+  Object {
+    "bar": "shipped",
+    "bar_expr": "0",
+    "foo": "shipped",
+  },
+]
+`;
diff --git a/packages/cubejs-testing/test/__snapshots__/smoke-multidb.test.ts.snap b/packages/cubejs-testing/test/__snapshots__/smoke-multidb.test.ts.snap
index b1bb0e431e..1d8d701454 100644
--- a/packages/cubejs-testing/test/__snapshots__/smoke-multidb.test.ts.snap
+++ b/packages/cubejs-testing/test/__snapshots__/smoke-multidb.test.ts.snap
@@ -1,5 +1,21 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`multidb SQL pushdown queries to different data sources: Products 1`] = `
+Array [
+  Object {
+    "name": "apples",
+  },
+]
+`;
+
+exports[`multidb SQL pushdown queries to different data sources: Suppliers 1`] = `
+Array [
+  Object {
+    "company": "Fruits Inc",
+  },
+]
+`;
+
 exports[`multidb query: query 1`] = `
 Array [
   Object {
diff --git a/packages/cubejs-testing/test/__snapshots__/smoke-rbac.test.ts.snap b/packages/cubejs-testing/test/__snapshots__/smoke-rbac.test.ts.snap
index c6fd88b4ce..645cd46bdd 100644
--- a/packages/cubejs-testing/test/__snapshots__/smoke-rbac.test.ts.snap
+++ b/packages/cubejs-testing/test/__snapshots__/smoke-rbac.test.ts.snap
@@ -8,6 +8,81 @@ Array [
 ]
 `;
 
+exports[`Cube RBAC Engine [Python config] RBAC via SQL API [python config] SELECT * from users_view: users_view_python 1`] = `
+Array [
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 400,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 401,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 402,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 403,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 404,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 405,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 406,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 407,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 408,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 409,
+  },
+]
+`;
+
 exports[`Cube RBAC Engine [Python config][dev mode] products with no matching policy: products_no_policy_python 1`] = `
 Array [
   Object {
@@ -611,6 +686,81 @@ Array [
 ]
 `;
 
+exports[`Cube RBAC Engine RBAC via SQL API SELECT * from users_view: users_view_js 1`] = `
+Array [
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 400,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 401,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 402,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 403,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 404,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 405,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 406,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 407,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 408,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "city": "Austin",
+    "count": "1",
+    "id": 409,
+  },
+]
+`;
+
 exports[`Cube RBAC Engine RBAC via SQL API default policy SELECT with member expressions: users_member_expression 1`] = `
 Array [
   Object {
@@ -620,3 +770,153 @@ Array [
 `;
 
 exports[`Cube RBAC Engine RBAC via SQL API manager SELECT * from line_items: line_items_manager 1`] = `Array []`;
+
+exports[`Cube RBAC Engine RBAC via SQL changing users Switching user should allow more members to be visible: line_items 1`] = `
+Array [
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "count": "1",
+    "created_at": 2018-10-23T07:54:39.000Z,
+    "price": 267,
+    "quantity": 2,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "count": "1",
+    "created_at": 2018-01-01T13:50:20.000Z,
+    "price": 263,
+    "quantity": 7,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "count": "1",
+    "created_at": 2017-05-13T21:23:08.000Z,
+    "price": 180,
+    "quantity": 8,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "count": "1",
+    "created_at": 2018-04-10T22:51:15.000Z,
+    "price": 169,
+    "quantity": 6,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "count": "1",
+    "created_at": 2017-07-16T15:00:34.000Z,
+    "price": 156,
+    "quantity": 1,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "count": "1",
+    "created_at": 2019-05-23T04:25:27.000Z,
+    "price": 36,
+    "quantity": 5,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "count": "1",
+    "created_at": 2018-09-29T20:29:30.000Z,
+    "price": 245,
+    "quantity": 4,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "count": "1",
+    "created_at": 2019-04-17T03:32:54.000Z,
+    "price": 232,
+    "quantity": 8,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "count": "1",
+    "created_at": 2019-11-15T18:22:17.000Z,
+    "price": 63,
+    "quantity": 8,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "count": "1",
+    "created_at": 2019-12-16T08:09:36.000Z,
+    "price": 68,
+    "quantity": 6,
+  },
+]
+`;
+
+exports[`Cube RBAC Engine RBAC via SQL changing users Switching user should allow more members to be visible: line_items_default 1`] = `
+Array [
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "created_at": 2018-10-23T07:54:39.000Z,
+    "quantity": 2,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "created_at": 2018-01-01T13:50:20.000Z,
+    "quantity": 7,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "created_at": 2017-05-13T21:23:08.000Z,
+    "quantity": 8,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "created_at": 2018-04-10T22:51:15.000Z,
+    "quantity": 6,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "created_at": 2017-07-16T15:00:34.000Z,
+    "quantity": 1,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "created_at": 2019-05-23T04:25:27.000Z,
+    "quantity": 5,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "created_at": 2018-09-29T20:29:30.000Z,
+    "quantity": 4,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "created_at": 2019-04-17T03:32:54.000Z,
+    "quantity": 8,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "created_at": 2019-11-15T18:22:17.000Z,
+    "quantity": 8,
+  },
+  Object {
+    "__cubeJoinField": null,
+    "__user": null,
+    "created_at": 2019-12-16T08:09:36.000Z,
+    "quantity": 6,
+  },
+]
+`;
diff --git a/packages/cubejs-testing/test/driver-postgres.test.ts b/packages/cubejs-testing/test/driver-postgres.test.ts
index 01704791f1..38f85585d4 100644
--- a/packages/cubejs-testing/test/driver-postgres.test.ts
+++ b/packages/cubejs-testing/test/driver-postgres.test.ts
@@ -1,4 +1,4 @@
-import { mainTestSet, preAggsTestSet, productionTestSet } from './driverTests/testSets';
+import { mainTestSet, multiQueryTestSet, preAggsTestSet, productionTestSet } from './driverTests/testSets';
 import { executeTestSuite } from './driver-test-suite';
 
 executeTestSuite({
@@ -6,6 +6,11 @@ executeTestSuite({
   tests: mainTestSet,
 });
 
+executeTestSuite({
+  type: 'postgres',
+  tests: multiQueryTestSet,
+});
+
 executeTestSuite({
   type: 'postgres',
   tests: mainTestSet,
diff --git a/packages/cubejs-testing/test/driver-test-suite.ts b/packages/cubejs-testing/test/driver-test-suite.ts
index 765414670f..3a923b893b 100644
--- a/packages/cubejs-testing/test/driver-test-suite.ts
+++ b/packages/cubejs-testing/test/driver-test-suite.ts
@@ -68,7 +68,7 @@ export function executeTestSuite({ type, tests, config = {} }: TestSuite) {
     for (const t of tests) {
       const jsonConfig = JSON.stringify(overridedConfig);
       const testNameWithHash = `${t.name}_${jsonConfig}`;
-      
+
       if (t.type === 'basic') {
         // eslint-disable-next-line no-loop-func
         const cbFn = async () => {
@@ -83,6 +83,26 @@ export function executeTestSuite({ type, tests, config = {} }: TestSuite) {
           }
         };
 
+        if (t.skip) {
+          test.skip(testNameWithHash, cbFn);
+        } else {
+          test(testNameWithHash, cbFn);
+        }
+      } else if (t.type === 'multi') {
+        // eslint-disable-next-line no-loop-func
+        const cbFn = async () => {
+          const response = await client.load(t.query);
+
+          const resultSets = response.decompose();
+          expect(resultSets).toMatchSnapshot('query');
+
+          if (t.expectArray) {
+            for (const expectFn of t.expectArray) {
+              expectFn(response);
+            }
+          }
+        };
+
         if (t.skip) {
           test.skip(testNameWithHash, cbFn);
         } else {
diff --git a/packages/cubejs-testing/test/driverTests/driverTest.ts b/packages/cubejs-testing/test/driverTests/driverTest.ts
index 9272164c90..b4cecec672 100644
--- a/packages/cubejs-testing/test/driverTests/driverTest.ts
+++ b/packages/cubejs-testing/test/driverTests/driverTest.ts
@@ -7,7 +7,7 @@ export type TestType = 'basic' | 'withError' | 'testFn';
 
 type DriverTestArg = {
   name: string;
-  query: Query;
+  query: Query | Query[];
   expectArray?: ((response: ResultSet<QueryRecordType<Query>>) => any)[];
   schemas: Schemas;
   skip?: boolean;
@@ -23,7 +23,7 @@ type DriverTestWithErrorArg = {
 
 export type DriverTestBasic = {
   name: string,
-  query: Query,
+  query: Query | Query[],
   expectArray?: ((response: ResultSet<QueryRecordType<Query>>) => any)[]
   schemas: Schemas,
   skip?: boolean;
@@ -32,13 +32,22 @@ export type DriverTestBasic = {
 
 export type DriverTestWithError = {
   name: string;
-  query: Query;
+  query: Query | Query[];
   expectArray?: ((e: Error) => any)[];
   schemas: Schemas;
   skip?: boolean;
   type: 'withError';
 };
 
+export type DriverTestMulti = {
+  name: string,
+  query: Query | Query[],
+  expectArray?: ((response: ResultSet<QueryRecordType<Query>>) => any)[]
+  schemas: Schemas,
+  skip?: boolean;
+  type: 'multi';
+};
+
 type DriverTestFnArg = {
   name: string;
   schemas: Schemas,
@@ -50,7 +59,7 @@ export type DriverTestFn = DriverTestFnArg & {
   type: 'testFn';
 };
 
-export type DriverTest = DriverTestBasic | DriverTestWithError | DriverTestFn;
+export type DriverTest = DriverTestBasic | DriverTestWithError | DriverTestFn | DriverTestMulti;
 
 export function driverTest(
   { name, query, expectArray = [], skip, schemas }: DriverTestArg
@@ -70,6 +79,12 @@ export function driverTestFn(
   return { name, testFn, schemas, skip, type: 'testFn' };
 }
 
+export function driverTestMulti(
+  { name, query, expectArray = [], skip, schemas }: DriverTestArg
+): DriverTestMulti {
+  return { name, query, expectArray, schemas, skip, type: 'multi' };
+}
+
 export function testSet(tests: DriverTest[]) {
   const uniqTests = uniqBy((t) => t.name, tests);
   return uniqTests;
diff --git a/packages/cubejs-testing/test/driverTests/testSets.ts b/packages/cubejs-testing/test/driverTests/testSets.ts
index 9b73e0a12b..2e533ac031 100644
--- a/packages/cubejs-testing/test/driverTests/testSets.ts
+++ b/packages/cubejs-testing/test/driverTests/testSets.ts
@@ -62,6 +62,7 @@ import {
   hiddenCube,
   viewMetaExposed,
   preAggsCustomersRunningTotal,
+  queryingECommerceCompareDateRangesByCustomerOverProductNameByMonth,
 } from './tests';
 import { testSet } from './driverTest';
 
@@ -156,3 +157,7 @@ export const productionTestSet = testSet([
   hiddenMember,
   hiddenCube,
 ]);
+
+export const multiQueryTestSet = testSet([
+  queryingECommerceCompareDateRangesByCustomerOverProductNameByMonth,
+]);
diff --git a/packages/cubejs-testing/test/driverTests/tests.ts b/packages/cubejs-testing/test/driverTests/tests.ts
index 7cb3d0e52b..6e8adfddbd 100644
--- a/packages/cubejs-testing/test/driverTests/tests.ts
+++ b/packages/cubejs-testing/test/driverTests/tests.ts
@@ -1,6 +1,6 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { expect } from '@jest/globals';
-import { driverTest, driverTestFn, driverTestWithError } from './driverTest';
+import { driverTest, driverTestFn, driverTestMulti, driverTestWithError } from './driverTest';
 
 const commonSchemas = [
   'CAST.js',
@@ -189,7 +189,7 @@ export const filteringCustomersCubeThird = driverTest(
     },
     schemas: commonSchemas,
   }
-  
+
 );
 
 export const filteringCustomersEndsWithFilterFirst = driverTest({
@@ -1296,6 +1296,31 @@ export const preAggsCustomersRunningTotal = driverTest({
   schemas: commonSchemas
 });
 
+export const queryingECommerceCompareDateRangesByCustomerOverProductNameByMonth = driverTestMulti({
+  name: 'querying ECommerce: compare DateRanges by customer over productName by month',
+  query: [{
+    timeDimensions: [{
+      dimension: 'ECommerce.orderDate',
+      granularity: 'month',
+      compareDateRange: [
+        ['2023-01-01', '2024-01-01'],
+        ['2024-01-01', '2025-01-01']
+      ]
+    }],
+    dimensions: [
+      'ECommerce.productName'
+    ],
+    measures: [
+      'ECommerce.count'
+    ],
+    order: {
+      'ECommerce.orderDate': 'desc',
+      'ECommerce.productName': 'asc',
+    },
+  }],
+  schemas: commonSchemas
+});
+
 export const queryingEcommerceTotalQuantifyAvgDiscountTotal = driverTestWithError({
   name: 'querying ECommerce: total quantity, avg discount, total ' +
   'sales, total profit by product + order + total -- noisy ' +
diff --git a/packages/cubejs-testing/test/smoke-cubesql.test.ts b/packages/cubejs-testing/test/smoke-cubesql.test.ts
index 514686806c..7a780766b9 100644
--- a/packages/cubejs-testing/test/smoke-cubesql.test.ts
+++ b/packages/cubejs-testing/test/smoke-cubesql.test.ts
@@ -660,5 +660,40 @@ filter_subq AS (
       const res = await connection.query(query);
       expect(res.rows).toMatchSnapshot('query-view-deep-joins');
     });
+
+    test('wrapper with duplicated members', async () => {
+      const query = `
+        SELECT
+          "foo",
+          "bar",
+          CASE
+            WHEN "bar" = 'new'
+            THEN 1
+            ELSE 0
+            END
+            AS "bar_expr"
+        FROM (
+          SELECT
+            "rows"."foo" AS "foo",
+            "rows"."bar" AS "bar"
+          FROM (
+            SELECT
+              "status" AS "foo",
+              "status" AS "bar"
+            FROM Orders
+          ) "rows"
+          GROUP BY
+            "foo",
+            "bar"
+        ) "_"
+        ORDER BY
+          "bar_expr"
+          LIMIT 1
+        ;
+      `;
+
+      const res = await connection.query(query);
+      expect(res.rows).toMatchSnapshot('wrapper-duplicated-members');
+    });
   });
 });
diff --git a/packages/cubejs-testing/test/smoke-multidb.test.ts b/packages/cubejs-testing/test/smoke-multidb.test.ts
index b5f5df5295..4e869a20cf 100644
--- a/packages/cubejs-testing/test/smoke-multidb.test.ts
+++ b/packages/cubejs-testing/test/smoke-multidb.test.ts
@@ -3,6 +3,7 @@ import { MysqlDBRunner, PostgresDBRunner } from '@cubejs-backend/testing-shared'
 import cubejs, { CubeApi } from '@cubejs-client/core';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { afterAll, beforeAll, expect, jest } from '@jest/globals';
+import { Client as PgClient } from 'pg';
 import { BirdBox, getBirdbox } from '../src';
 import {
   DEFAULT_API_TOKEN,
@@ -11,12 +12,43 @@ import {
   JEST_BEFORE_ALL_DEFAULT_TIMEOUT,
 } from './smoke-tests';
 
+// TODO: Random port?
+const pgPort = 5656;
+let connectionId = 0;
+
+async function createPostgresClient(user: string, password: string) {
+  connectionId++;
+  const currentConnId = connectionId;
+
+  console.debug(`[pg] new connection ${currentConnId}`);
+
+  const conn = new PgClient({
+    database: 'db',
+    port: pgPort,
+    host: '127.0.0.1',
+    user,
+    password,
+    ssl: false,
+  });
+  conn.on('error', (err) => {
+    console.log(err);
+  });
+  conn.on('end', () => {
+    console.debug(`[pg] end ${currentConnId}`);
+  });
+
+  await conn.connect();
+
+  return conn;
+}
+
 describe('multidb', () => {
   jest.setTimeout(60 * 5 * 1000);
   let db: StartedTestContainer;
   let db2: StartedTestContainer;
   let birdbox: BirdBox;
   let client: CubeApi;
+  let connection: PgClient;
 
   beforeAll(async () => {
     db = await PostgresDBRunner.startContainer({});
@@ -39,6 +71,9 @@ describe('multidb', () => {
         CUBEJS_DB_USER2: 'root',
         CUBEJS_DB_PASS2: 'Test1test',
 
+        CUBEJS_PG_SQL_PORT: `${pgPort}`,
+        CUBESQL_SQL_PUSH_DOWN: 'true',
+
         ...DEFAULT_CONFIG,
       },
       {
@@ -49,6 +84,7 @@ describe('multidb', () => {
     client = cubejs(async () => DEFAULT_API_TOKEN, {
       apiUrl: birdbox.configuration.apiUrl,
     });
+    connection = await createPostgresClient('admin', 'admin_password');
   }, JEST_BEFORE_ALL_DEFAULT_TIMEOUT);
 
   afterAll(async () => {
@@ -69,4 +105,32 @@ describe('multidb', () => {
     });
     expect(response.rawData()).toMatchSnapshot('query');
   });
+
+  test('SQL pushdown queries to different data sources: Products', async () => {
+    const res = await connection.query(`
+  SELECT
+    name
+  FROM
+    Products
+  WHERE
+    LOWER(name) = 'apples'
+  GROUP BY
+    1
+    `);
+    expect(res.rows).toMatchSnapshot();
+  });
+
+  test('SQL pushdown queries to different data sources: Suppliers', async () => {
+    const res = await connection.query(`
+  SELECT
+    company
+  FROM
+    Suppliers
+  WHERE
+    LOWER(company) = 'fruits inc'
+  GROUP BY
+    1
+    `);
+    expect(res.rows).toMatchSnapshot();
+  });
 });
diff --git a/packages/cubejs-testing/test/smoke-rbac.test.ts b/packages/cubejs-testing/test/smoke-rbac.test.ts
index 56823762e3..2d825ebf77 100644
--- a/packages/cubejs-testing/test/smoke-rbac.test.ts
+++ b/packages/cubejs-testing/test/smoke-rbac.test.ts
@@ -152,6 +152,12 @@ describe('Cube RBAC Engine', () => {
       // Querying a cube with nested filters and mixed values should not cause any issues
       expect(res.rows).toMatchSnapshot('users');
     });
+
+    test('SELECT * from users_view', async () => {
+      const res = await connection.query('SELECT * FROM users_view limit 10');
+      // Make sure view policies are evaluated correctly in yaml schemas
+      expect(res.rows).toMatchSnapshot('users_view_js');
+    });
   });
 
   describe('RBAC via SQL API manager', () => {
@@ -192,6 +198,28 @@ describe('Cube RBAC Engine', () => {
     });
   });
 
+  describe('RBAC via SQL changing users', () => {
+    let connection: PgClient;
+
+    beforeAll(async () => {
+      connection = await createPostgresClient('restricted', 'restricted_password');
+    });
+
+    afterAll(async () => {
+      await connection.end();
+    }, JEST_AFTER_ALL_DEFAULT_TIMEOUT);
+
+    test('Switching user should allow more members to be visible', async () => {
+      const resDefault = await connection.query('SELECT * FROM line_items limit 10');
+      expect(resDefault.rows).toMatchSnapshot('line_items_default');
+
+      await connection.query('SET USER=admin');
+
+      const resAdmin = await connection.query('SELECT * FROM line_items limit 10');
+      expect(resAdmin.rows).toMatchSnapshot('line_items');
+    });
+  });
+
   describe('RBAC via REST API', () => {
     let client: CubeApi;
     let defaultClient: CubeApi;
@@ -398,6 +426,12 @@ describe('Cube RBAC Engine [Python config]', () => {
       // It should also exclude the `created_at` dimension as per memberLevel policy
       expect(res.rows).toMatchSnapshot('users_python');
     });
+
+    test('SELECT * from users_view', async () => {
+      const res = await connection.query('SELECT * FROM users_view limit 10');
+      // Make sure view policies are evaluated correctly in yaml schemas
+      expect(res.rows).toMatchSnapshot('users_view_python');
+    });
   });
 });
 
diff --git a/packages/cubejs-trino-driver/CHANGELOG.md b/packages/cubejs-trino-driver/CHANGELOG.md
index c517a66112..637063f7a4 100644
--- a/packages/cubejs-trino-driver/CHANGELOG.md
+++ b/packages/cubejs-trino-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
+## [1.2.5](https://github.com/cube-js/cube/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
+## [1.2.4](https://github.com/cube-js/cube/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
+## [1.2.1](https://github.com/cube-js/cube/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 **Note:** Version bump only for package @cubejs-backend/trino-driver
diff --git a/packages/cubejs-trino-driver/package.json b/packages/cubejs-trino-driver/package.json
index 5573474b5c..b917b60a13 100644
--- a/packages/cubejs-trino-driver/package.json
+++ b/packages/cubejs-trino-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/trino-driver",
   "description": "Cube.js Trino database driver",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -25,10 +25,10 @@
     "lint:fix": "eslint --fix src/* --ext .ts"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/prestodb-driver": "1.1.17",
-    "@cubejs-backend/schema-compiler": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/prestodb-driver": "1.2.14",
+    "@cubejs-backend/schema-compiler": "1.2.14",
+    "@cubejs-backend/shared": "1.2.14",
     "presto-client": "^0.12.2",
     "sqlstring": "^2.3.1"
   },
@@ -37,7 +37,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0"
+    "@cubejs-backend/linter": "1.2.14"
   },
   "eslintConfig": {
     "extends": "../cubejs-linter"
diff --git a/packages/cubejs-vertica-driver/CHANGELOG.md b/packages/cubejs-vertica-driver/CHANGELOG.md
index 420d37a704..0419a2b8eb 100644
--- a/packages/cubejs-vertica-driver/CHANGELOG.md
+++ b/packages/cubejs-vertica-driver/CHANGELOG.md
@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube.js/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
+## [1.2.13](https://github.com/cube-js/cube.js/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
+## [1.2.12](https://github.com/cube-js/cube.js/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
+## [1.2.11](https://github.com/cube-js/cube.js/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
+## [1.2.10](https://github.com/cube-js/cube.js/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
+## [1.2.9](https://github.com/cube-js/cube.js/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
+## [1.2.8](https://github.com/cube-js/cube.js/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
+## [1.2.7](https://github.com/cube-js/cube.js/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
+## [1.2.6](https://github.com/cube-js/cube.js/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
+## [1.2.5](https://github.com/cube-js/cube.js/compare/v1.2.4...v1.2.5) (2025-02-13)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
+## [1.2.4](https://github.com/cube-js/cube.js/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
+## [1.2.3](https://github.com/cube-js/cube.js/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
+## [1.2.2](https://github.com/cube-js/cube.js/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
+## [1.2.1](https://github.com/cube-js/cube.js/compare/v1.2.0...v1.2.1) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
+# [1.2.0](https://github.com/cube-js/cube.js/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
 ## [1.1.17](https://github.com/cube-js/cube.js/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Features
diff --git a/packages/cubejs-vertica-driver/package.json b/packages/cubejs-vertica-driver/package.json
index 1b391d7901..ef60b0d607 100644
--- a/packages/cubejs-vertica-driver/package.json
+++ b/packages/cubejs-vertica-driver/package.json
@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/vertica-driver",
   "description": "Cube.js Vertica database driver",
   "author": "Eduard Karacharov, Tim Brown, Cube Dev, Inc.",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.js.git",
@@ -19,16 +19,16 @@
     "lint:fix": "eslint --fix **/*.js"
   },
   "dependencies": {
-    "@cubejs-backend/base-driver": "1.1.17",
-    "@cubejs-backend/query-orchestrator": "1.1.17",
-    "@cubejs-backend/schema-compiler": "1.1.17",
+    "@cubejs-backend/base-driver": "1.2.14",
+    "@cubejs-backend/query-orchestrator": "1.2.14",
+    "@cubejs-backend/schema-compiler": "1.2.14",
     "vertica-nodejs": "^1.0.3"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
-    "@cubejs-backend/testing-shared": "1.1.17",
-    "jest": "^27.5.1",
+    "@cubejs-backend/linter": "1.2.14",
+    "@cubejs-backend/testing-shared": "1.2.14",
+    "jest": "^27",
     "testcontainers": "^10.13.0"
   },
   "publishConfig": {
diff --git a/rust/cubenativeutils/Cargo.lock b/rust/cubenativeutils/Cargo.lock
index 59b5872a1f..9a8d0c550d 100644
--- a/rust/cubenativeutils/Cargo.lock
+++ b/rust/cubenativeutils/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -34,7 +34,7 @@ version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -204,7 +204,7 @@ checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
@@ -293,7 +293,7 @@ dependencies = [
  "arrayref",
  "arrayvec",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "constant_time_eq",
 ]
 
@@ -412,12 +412,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -432,9 +426,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -545,7 +539,7 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -677,7 +671,6 @@ dependencies = [
 name = "cubesql"
 version = "0.28.0"
 dependencies = [
- "anyhow",
  "arc-swap",
  "async-stream",
  "async-trait",
@@ -685,12 +678,10 @@ dependencies = [
  "bigdecimal",
  "bincode",
  "bitflags 1.3.2",
- "byteorder",
  "bytes",
  "chrono",
  "chrono-tz",
  "comfy-table 7.1.1",
- "csv",
  "cubeclient",
  "datafusion",
  "egg",
@@ -699,11 +690,10 @@ dependencies = [
  "futures-util",
  "hashbrown 0.14.5",
  "indexmap 1.9.3",
- "itertools",
+ "itertools 0.14.0",
  "log",
  "lru",
  "minijinja",
- "mockall",
  "paste",
  "pg-srv",
  "postgres-types",
@@ -715,10 +705,9 @@ dependencies = [
  "sha1_smol",
  "sha2",
  "simple_logger",
- "smallvec",
  "sqlparser",
  "tera",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tokio-util",
  "tracing",
@@ -740,7 +729,7 @@ dependencies = [
  "datafusion-physical-expr",
  "futures",
  "hashbrown 0.12.3",
- "itertools",
+ "itertools 0.10.5",
  "lazy_static",
  "log",
  "num_cpus",
@@ -817,12 +806,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "difference"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -834,12 +817,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "downcast"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb454f0228b18c7f4c3b0ebbee346ed9c52e7443b0999cd543ff3571205701d"
-
 [[package]]
 name = "egg"
 version = "0.9.5"
@@ -858,7 +835,7 @@ dependencies = [
  "smallvec",
  "symbol_table",
  "symbolic_expressions",
- "thiserror",
+ "thiserror 1.0.61",
  "vectorize",
 ]
 
@@ -934,7 +911,7 @@ checksum = "86b428b715fdbdd1c364b84573b5fdc0f84f8e423661b9f398735278bc7f2b6a"
 dependencies = [
  "bitflags 1.3.2",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.61",
 ]
 
 [[package]]
@@ -947,21 +924,18 @@ dependencies = [
  "miniz_oxide",
 ]
 
-[[package]]
-name = "float-cmp"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -971,21 +945,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fragile"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7464c5c4a3f014d9b2ec4073650e5c06596f385060af740fc45ad5a19f959e8"
-dependencies = [
- "fragile 2.0.0",
-]
-
-[[package]]
-name = "fragile"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -1106,7 +1065,7 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "wasi",
 ]
@@ -1167,6 +1126,17 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -1385,7 +1355,7 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -1420,6 +1390,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -1526,7 +1505,7 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "windows-targets 0.52.6",
 ]
 
@@ -1560,11 +1539,11 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lru"
-version = "0.12.3"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
+checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -1593,7 +1572,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "digest",
 ]
 
@@ -1657,33 +1636,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "mockall"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cabea45a7fc0e37093f4f30a5e2b62602253f91791c057d5f0470c63260c3d"
-dependencies = [
- "cfg-if 0.1.10",
- "downcast",
- "fragile 1.2.2",
- "lazy_static",
- "mockall_derive",
- "predicates",
- "predicates-tree",
-]
-
-[[package]]
-name = "mockall_derive"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c461918bf7f59eefb1459252756bf2351a995d6bd510d0b2061bd86bcdabfa6"
-dependencies = [
- "cfg-if 0.1.10",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "multiversion"
 version = "0.6.1"
@@ -1730,12 +1682,6 @@ dependencies = [
  "syn-mid",
 ]
 
-[[package]]
-name = "normalize-line-endings"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
-
 [[package]]
 name = "num"
 version = "0.4.3"
@@ -1874,7 +1820,7 @@ version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
@@ -1939,7 +1885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
 dependencies = [
  "memchr",
- "thiserror",
+ "thiserror 1.0.61",
  "ucd-trie",
 ]
 
@@ -1986,7 +1932,7 @@ dependencies = [
  "bytes",
  "chrono",
  "log",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
 ]
 
@@ -2102,35 +2048,6 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
-[[package]]
-name = "predicates"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df"
-dependencies = [
- "difference",
- "float-cmp",
- "normalize-line-endings",
- "predicates-core",
- "regex",
-]
-
-[[package]]
-name = "predicates-core"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
-
-[[package]]
-name = "predicates-tree"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
-dependencies = [
- "predicates-core",
- "termtree",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "3.1.0"
@@ -2204,7 +2121,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls",
- "thiserror",
+ "thiserror 1.0.61",
  "tokio",
  "tracing",
 ]
@@ -2221,7 +2138,7 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "slab",
- "thiserror",
+ "thiserror 1.0.61",
  "tinyvec",
  "tracing",
 ]
@@ -2390,7 +2307,7 @@ dependencies = [
  "http",
  "reqwest",
  "serde",
- "thiserror",
+ "thiserror 1.0.61",
  "tower-service",
 ]
 
@@ -2401,7 +2318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "getrandom",
  "libc",
  "spin",
@@ -2635,7 +2552,7 @@ version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest",
 ]
@@ -2860,7 +2777,7 @@ version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fastrand",
  "rustix",
  "windows-sys 0.52.0",
@@ -2883,18 +2800,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "termtree"
-version = "0.4.1"
+name = "thiserror"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl 1.0.61",
+]
 
 [[package]]
 name = "thiserror"
-version = "1.0.61"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 2.0.11",
 ]
 
 [[package]]
@@ -2908,6 +2828,17 @@ dependencies = [
  "syn 2.0.95",
 ]
 
+[[package]]
+name = "thiserror-impl"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+]
+
 [[package]]
 name = "threadpool"
 version = "1.8.1"
@@ -3294,7 +3225,7 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "wasm-bindgen-macro",
 ]
 
@@ -3319,7 +3250,7 @@ version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -3567,7 +3498,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "windows-sys 0.48.0",
 ]
 
diff --git a/rust/cubenativeutils/rust-toolchain.toml b/rust/cubenativeutils/rust-toolchain.toml
index ef8073e17f..8237034eda 100644
--- a/rust/cubenativeutils/rust-toolchain.toml
+++ b/rust/cubenativeutils/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2024-07-15"
+channel = "1.84.1"
 components = ["rustfmt", "rustc-dev", "clippy"]
 profile = "minimal"
diff --git a/rust/cubenativeutils/rustfmt.toml b/rust/cubenativeutils/rustfmt.toml
index d9ba5fdb90..fb03d7e9d9 100644
--- a/rust/cubenativeutils/rustfmt.toml
+++ b/rust/cubenativeutils/rustfmt.toml
@@ -1 +1,2 @@
-imports_granularity = "Crate"
\ No newline at end of file
+# TODO: Uncomment, when it will become stable in rustfmt - https://github.com/rust-lang/rustfmt/issues/4991
+# imports_granularity = "Crate"
diff --git a/rust/cubenativeutils/src/lib.rs b/rust/cubenativeutils/src/lib.rs
index cc20b75017..0e6c3b1867 100644
--- a/rust/cubenativeutils/src/lib.rs
+++ b/rust/cubenativeutils/src/lib.rs
@@ -1,2 +1,2 @@
 pub mod wrappers;
-pub use cubesql::CubeError;
+pub use cubesql::{CubeError, CubeErrorCauseType};
diff --git a/rust/cubenativeutils/src/wrappers/context.rs b/rust/cubenativeutils/src/wrappers/context.rs
index 98bb3ba6f7..9695b30717 100644
--- a/rust/cubenativeutils/src/wrappers/context.rs
+++ b/rust/cubenativeutils/src/wrappers/context.rs
@@ -1,13 +1,15 @@
 use super::{inner_types::InnerTypes, object_handle::NativeObjectHandle};
+use cubesql::CubeError;
 
 pub trait NativeContext<IT: InnerTypes>: Clone {
-    fn boolean(&self, v: bool) -> IT::Boolean;
-    fn string(&self, v: String) -> IT::String;
-    fn number(&self, v: f64) -> IT::Number;
-    fn undefined(&self) -> NativeObjectHandle<IT>;
-    fn empty_array(&self) -> IT::Array;
-    fn empty_struct(&self) -> IT::Struct;
-    fn to_string_fn(&self, result: String) -> IT::Function;
+    fn boolean(&self, v: bool) -> Result<IT::Boolean, CubeError>;
+    fn string(&self, v: String) -> Result<IT::String, CubeError>;
+    fn number(&self, v: f64) -> Result<IT::Number, CubeError>;
+    fn undefined(&self) -> Result<NativeObjectHandle<IT>, CubeError>;
+    fn empty_array(&self) -> Result<IT::Array, CubeError>;
+    fn empty_struct(&self) -> Result<IT::Struct, CubeError>;
+    //fn boxed<T: 'static>(&self, value: T) -> impl NativeBox<IT, T>;
+    fn to_string_fn(&self, result: String) -> Result<IT::Function, CubeError>;
 }
 
 #[derive(Clone)]
@@ -22,26 +24,26 @@ impl<IT: InnerTypes> NativeContextHolder<IT> {
     pub fn context(&self) -> &impl NativeContext<IT> {
         &self.context
     }
-    pub fn boolean(&self, v: bool) -> IT::Boolean {
+    pub fn boolean(&self, v: bool) -> Result<IT::Boolean, CubeError> {
         self.context.boolean(v)
     }
-    pub fn string(&self, v: String) -> IT::String {
+    pub fn string(&self, v: String) -> Result<IT::String, CubeError> {
         self.context.string(v)
     }
-    pub fn number(&self, v: f64) -> IT::Number {
+    pub fn number(&self, v: f64) -> Result<IT::Number, CubeError> {
         self.context.number(v)
     }
-    pub fn undefined(&self) -> NativeObjectHandle<IT> {
+    pub fn undefined(&self) -> Result<NativeObjectHandle<IT>, CubeError> {
         self.context.undefined()
     }
-    pub fn empty_array(&self) -> IT::Array {
+    pub fn empty_array(&self) -> Result<IT::Array, CubeError> {
         self.context.empty_array()
     }
-    pub fn empty_struct(&self) -> IT::Struct {
+    pub fn empty_struct(&self) -> Result<IT::Struct, CubeError> {
         self.context.empty_struct()
     }
     #[allow(dead_code)]
-    pub fn to_string_fn(&self, result: String) -> IT::Function {
+    pub fn to_string_fn(&self, result: String) -> Result<IT::Function, CubeError> {
         self.context.to_string_fn(result)
     }
 }
diff --git a/rust/cubenativeutils/src/wrappers/neon/context.rs b/rust/cubenativeutils/src/wrappers/neon/context.rs
index 96950e5e3a..aff6f55a69 100644
--- a/rust/cubenativeutils/src/wrappers/neon/context.rs
+++ b/rust/cubenativeutils/src/wrappers/neon/context.rs
@@ -1,4 +1,3 @@
-//use super::object::NeonObject;
 use super::{
     inner_types::NeonInnerTypes,
     object::{
@@ -12,21 +11,31 @@ use crate::wrappers::{
 use cubesql::CubeError;
 use neon::prelude::*;
 use std::{
-    cell::{RefCell, RefMut},
+    cell::RefCell,
     marker::PhantomData,
+    panic::{catch_unwind, resume_unwind, AssertUnwindSafe},
     rc::{Rc, Weak},
 };
-pub struct ContextWrapper<'cx, C: Context<'cx>> {
+
+pub trait NoenContextLifetimeExpand<'cx> {
+    type ExpandedResult: Context<'static>;
+    fn expand_lifetime(self) -> Self::ExpandedResult;
+}
+
+impl<'cx> NoenContextLifetimeExpand<'cx> for FunctionContext<'cx> {
+    type ExpandedResult = FunctionContext<'static>;
+    fn expand_lifetime(self) -> Self::ExpandedResult {
+        unsafe { std::mem::transmute::<FunctionContext<'cx>, FunctionContext<'static>>(self) }
+    }
+}
+
+pub struct ContextWrapper<C: Context<'static>> {
     cx: C,
-    lifetime: PhantomData<&'cx ()>,
 }
 
-impl<'cx, C: Context<'cx>> ContextWrapper<'cx, C> {
+impl<C: Context<'static>> ContextWrapper<C> {
     pub fn new(cx: C) -> Rc<RefCell<Self>> {
-        Rc::new(RefCell::new(Self {
-            cx,
-            lifetime: Default::default(),
-        }))
+        Rc::new(RefCell::new(Self { cx }))
     }
 
     pub fn with_context<T, F>(&mut self, f: F) -> T
@@ -41,129 +50,129 @@ impl<'cx, C: Context<'cx>> ContextWrapper<'cx, C> {
     }
 }
 
-pub struct ContextHolder<'cx, C: Context<'cx>> {
-    context: Rc<RefCell<ContextWrapper<'cx, C>>>,
+pub struct NeonContextGuard<'cx, C: Context<'cx> + NoenContextLifetimeExpand<'cx>> {
+    context: Rc<RefCell<ContextWrapper<C::ExpandedResult>>>,
+    lifetime: PhantomData<&'cx ()>,
 }
 
-impl<'cx, C: Context<'cx> + 'cx> ContextHolder<'cx, C> {
-    pub fn new(cx: C) -> Self {
+impl<'cx, C: Context<'cx> + NoenContextLifetimeExpand<'cx> + 'cx> NeonContextGuard<'cx, C> {
+    fn new(cx: C) -> Self {
         Self {
-            context: ContextWrapper::new(cx),
+            context: ContextWrapper::new(cx.expand_lifetime()),
+            lifetime: PhantomData,
         }
     }
 
-    pub fn borrow_mut(&self) -> RefMut<ContextWrapper<'cx, C>> {
-        self.context.borrow_mut()
+    fn context_holder(&self) -> ContextHolder<C::ExpandedResult> {
+        ContextHolder::new(Rc::downgrade(&self.context))
     }
 
-    pub fn with_context<T, F>(&self, f: F) -> T
-    where
-        F: FnOnce(&mut C) -> T,
-    {
-        let mut context = self.context.borrow_mut();
-        context.with_context(f)
+    fn unwrap(self) {
+        if Rc::strong_count(&self.context) > 0 {
+            match Rc::try_unwrap(self.context) {
+                Ok(_) => {}
+                Err(_) => panic!("Guarded context have more then one reference"),
+            }
+        }
+    }
+}
+
+pub fn neon_run_with_guarded_lifetime<'cx, C, T, F>(cx: C, func: F) -> T
+where
+    C: Context<'cx> + NoenContextLifetimeExpand<'cx> + 'cx,
+    F: FnOnce(ContextHolder<C::ExpandedResult>) -> T,
+{
+    let guard = NeonContextGuard::new(cx);
+    let context_holder = guard.context_holder();
+    let res = catch_unwind(AssertUnwindSafe(|| func(context_holder)));
+    guard.unwrap();
+
+    match res {
+        Ok(res) => res,
+        Err(e) => resume_unwind(e),
     }
+}
+
+pub struct ContextHolder<C: Context<'static>> {
+    context: Weak<RefCell<ContextWrapper<C>>>,
+}
 
-    /* pub fn as_native_context_holder(&self) -> NativeContextHolder {
-        NativeContextHolder::new(Box::new(self.clone()))
-    } */
+impl<C: Context<'static>> ContextHolder<C> {
+    fn new(context: Weak<RefCell<ContextWrapper<C>>>) -> Self {
+        Self { context }
+    }
 
-    pub fn weak(&self) -> WeakContextHolder<'cx, C> {
-        WeakContextHolder {
-            context: Rc::downgrade(&self.context),
+    pub fn with_context<T, F>(&self, f: F) -> Result<T, CubeError>
+    where
+        F: FnOnce(&mut C) -> T,
+    {
+        if let Some(context) = self.context.upgrade() {
+            let mut cx = context.borrow_mut();
+            let res = cx.with_context(f);
+            Ok(res)
+        } else {
+            Err(CubeError::internal(
+                "Call to neon context outside of its lifetime".to_string(),
+            ))
         }
     }
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NativeContext<NeonInnerTypes<'cx, C>> for ContextHolder<'cx, C> {
-    fn boolean(&self, v: bool) -> NeonBoolean<'cx, C> {
-        let obj = NeonObject::new(self.clone(), self.with_context(|cx| cx.boolean(v).upcast()));
-        obj.into_boolean().unwrap()
+impl<C: Context<'static> + 'static> NativeContext<NeonInnerTypes<C>> for ContextHolder<C> {
+    fn boolean(&self, v: bool) -> Result<NeonBoolean<C>, CubeError> {
+        let obj = NeonObject::new(
+            self.clone(),
+            self.with_context(|cx| cx.boolean(v).upcast())?,
+        );
+        obj.into_boolean()
     }
 
-    fn string(&self, v: String) -> NeonString<'cx, C> {
-        let obj = NeonObject::new(self.clone(), self.with_context(|cx| cx.string(v).upcast()));
-        obj.into_string().unwrap()
+    fn string(&self, v: String) -> Result<NeonString<C>, CubeError> {
+        let obj = NeonObject::new(self.clone(), self.with_context(|cx| cx.string(v).upcast())?);
+        obj.into_string()
     }
 
-    fn number(&self, v: f64) -> NeonNumber<'cx, C> {
-        let obj = NeonObject::new(self.clone(), self.with_context(|cx| cx.number(v).upcast()));
-        obj.into_number().unwrap()
+    fn number(&self, v: f64) -> Result<NeonNumber<C>, CubeError> {
+        let obj = NeonObject::new(self.clone(), self.with_context(|cx| cx.number(v).upcast())?);
+        obj.into_number()
     }
 
-    fn undefined(&self) -> NativeObjectHandle<NeonInnerTypes<'cx, C>> {
-        NativeObjectHandle::new(NeonObject::new(
+    fn undefined(&self) -> Result<NativeObjectHandle<NeonInnerTypes<C>>, CubeError> {
+        Ok(NativeObjectHandle::new(NeonObject::new(
             self.clone(),
-            self.with_context(|cx| cx.undefined().upcast()),
-        ))
+            self.with_context(|cx| cx.undefined().upcast())?,
+        )))
     }
 
-    fn empty_array(&self) -> NeonArray<'cx, C> {
+    fn empty_array(&self) -> Result<NeonArray<C>, CubeError> {
         let obj = NeonObject::new(
             self.clone(),
-            self.with_context(|cx| cx.empty_array().upcast()),
+            self.with_context(|cx| cx.empty_array().upcast())?,
         );
-        obj.into_array().unwrap()
+        obj.into_array()
     }
 
-    fn empty_struct(&self) -> NeonStruct<'cx, C> {
+    fn empty_struct(&self) -> Result<NeonStruct<C>, CubeError> {
         let obj = NeonObject::new(
             self.clone(),
-            self.with_context(|cx| cx.empty_object().upcast()),
+            self.with_context(|cx| cx.empty_object().upcast())?,
         );
-        obj.into_struct().unwrap()
+        obj.into_struct()
     }
-    fn to_string_fn(&self, result: String) -> NeonFunction<'cx, C> {
+    fn to_string_fn(&self, result: String) -> Result<NeonFunction<C>, CubeError> {
         let obj = NeonObject::new(
             self.clone(),
             self.with_context(|cx| {
                 JsFunction::new(cx, move |mut c| Ok(c.string(result.clone())))
                     .unwrap()
                     .upcast()
-            }),
+            })?,
         );
-        obj.into_function().unwrap()
-    }
-}
-
-impl<'cx, C: Context<'cx>> Clone for ContextHolder<'cx, C> {
-    fn clone(&self) -> Self {
-        Self {
-            context: self.context.clone(),
-        }
-    }
-}
-
-pub struct WeakContextHolder<'cx, C: Context<'cx>> {
-    context: Weak<RefCell<ContextWrapper<'cx, C>>>,
-}
-
-impl<'cx, C: Context<'cx>> WeakContextHolder<'cx, C> {
-    pub fn try_upgrade<'a>(&'a self) -> Result<ContextHolder<'a, C>, CubeError>
-    where
-        'a: 'cx,
-    {
-        if let Some(context) = self.context.upgrade() {
-            Ok(ContextHolder { context })
-        } else {
-            Err(CubeError::internal(format!("Neon context is not alive")))
-        }
-    }
-    pub fn with_context<T, F>(&self, f: F) -> Result<T, CubeError>
-    where
-        F: FnOnce(&mut C) -> T,
-    {
-        if let Some(context) = self.context.upgrade() {
-            let mut cx = context.borrow_mut();
-            let res = cx.with_context(f);
-            Ok(res)
-        } else {
-            Err(CubeError::internal(format!("Neon context is not alive")))
-        }
+        obj.into_function()
     }
 }
 
-impl<'cx, C: Context<'cx>> Clone for WeakContextHolder<'cx, C> {
+impl<C: Context<'static>> Clone for ContextHolder<C> {
     fn clone(&self) -> Self {
         Self {
             context: self.context.clone(),
diff --git a/rust/cubenativeutils/src/wrappers/neon/inner_types.rs b/rust/cubenativeutils/src/wrappers/neon/inner_types.rs
index 8bf32d0be8..5da5dca397 100644
--- a/rust/cubenativeutils/src/wrappers/neon/inner_types.rs
+++ b/rust/cubenativeutils/src/wrappers/neon/inner_types.rs
@@ -9,25 +9,25 @@ use crate::wrappers::inner_types::InnerTypes;
 use neon::prelude::*;
 use std::marker::PhantomData;
 
-pub struct NeonInnerTypes<'cx: 'static, C: Context<'cx>> {
-    lifetime: PhantomData<&'cx ContextHolder<'cx, C>>,
+pub struct NeonInnerTypes<C: Context<'static>> {
+    marker: PhantomData<ContextHolder<C>>,
 }
 
-impl<'cx, C: Context<'cx>> Clone for NeonInnerTypes<'cx, C> {
+impl<C: Context<'static>> Clone for NeonInnerTypes<C> {
     fn clone(&self) -> Self {
         Self {
-            lifetime: Default::default(),
+            marker: Default::default(),
         }
     }
 }
 
-impl<'cx: 'static, C: Context<'cx>> InnerTypes for NeonInnerTypes<'cx, C> {
-    type Object = NeonObject<'cx, C>;
-    type Context = ContextHolder<'cx, C>;
-    type Array = NeonArray<'cx, C>;
-    type Struct = NeonStruct<'cx, C>;
-    type String = NeonString<'cx, C>;
-    type Boolean = NeonBoolean<'cx, C>;
-    type Function = NeonFunction<'cx, C>;
-    type Number = NeonNumber<'cx, C>;
+impl<C: Context<'static> + 'static> InnerTypes for NeonInnerTypes<C> {
+    type Object = NeonObject<C>;
+    type Context = ContextHolder<C>;
+    type Array = NeonArray<C>;
+    type Struct = NeonStruct<C>;
+    type String = NeonString<C>;
+    type Boolean = NeonBoolean<C>;
+    type Function = NeonFunction<C>;
+    type Number = NeonNumber<C>;
 }
diff --git a/rust/cubenativeutils/src/wrappers/neon/object/base_types.rs b/rust/cubenativeutils/src/wrappers/neon/object/base_types.rs
index 26e58fc21f..2889f97087 100644
--- a/rust/cubenativeutils/src/wrappers/neon/object/base_types.rs
+++ b/rust/cubenativeutils/src/wrappers/neon/object/base_types.rs
@@ -1,75 +1,103 @@
-use super::NeonObject;
+use super::{NeonObject, NeonTypeHandle};
 use crate::wrappers::neon::inner_types::NeonInnerTypes;
+use std::marker::PhantomData;
 
-use crate::wrappers::object::{NativeBoolean, NativeNumber, NativeString, NativeType};
+use crate::wrappers::object::{NativeBoolean, NativeBox, NativeNumber, NativeString, NativeType};
 use cubesql::CubeError;
 use neon::prelude::*;
+use std::ops::Deref;
 
-pub struct NeonString<'cx: 'static, C: Context<'cx>> {
-    object: NeonObject<'cx, C>,
+pub struct NeonString<C: Context<'static>> {
+    object: NeonTypeHandle<C, JsString>,
 }
 
-impl<'cx, C: Context<'cx>> NeonString<'cx, C> {
-    pub fn new(object: NeonObject<'cx, C>) -> Self {
+impl<C: Context<'static>> NeonString<C> {
+    pub fn new(object: NeonTypeHandle<C, JsString>) -> Self {
         Self { object }
     }
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NativeType<NeonInnerTypes<'cx, C>> for NeonString<'cx, C> {
-    fn into_object(self) -> NeonObject<'cx, C> {
-        self.object
+impl<C: Context<'static> + 'static> NativeType<NeonInnerTypes<C>> for NeonString<C> {
+    fn into_object(self) -> NeonObject<C> {
+        self.object.upcast()
     }
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NativeString<NeonInnerTypes<'cx, C>> for NeonString<'cx, C> {
+impl<C: Context<'static> + 'static> NativeString<NeonInnerTypes<C>> for NeonString<C> {
     fn value(&self) -> Result<String, CubeError> {
         self.object
-            .map_downcast_neon_object::<JsString, _, _>(|cx, object| Ok(object.value(cx)))
+            .map_neon_object::<_, _>(|cx, object| Ok(object.value(cx)))?
     }
 }
 
-pub struct NeonNumber<'cx: 'static, C: Context<'cx>> {
-    object: NeonObject<'cx, C>,
+pub struct NeonNumber<C: Context<'static>> {
+    object: NeonTypeHandle<C, JsNumber>,
 }
 
-impl<'cx, C: Context<'cx>> NeonNumber<'cx, C> {
-    pub fn new(object: NeonObject<'cx, C>) -> Self {
+impl<C: Context<'static>> NeonNumber<C> {
+    pub fn new(object: NeonTypeHandle<C, JsNumber>) -> Self {
         Self { object }
     }
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NativeType<NeonInnerTypes<'cx, C>> for NeonNumber<'cx, C> {
-    fn into_object(self) -> NeonObject<'cx, C> {
-        self.object
+impl<C: Context<'static> + 'static> NativeType<NeonInnerTypes<C>> for NeonNumber<C> {
+    fn into_object(self) -> NeonObject<C> {
+        self.object.upcast()
     }
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NativeNumber<NeonInnerTypes<'cx, C>> for NeonNumber<'cx, C> {
+impl<C: Context<'static> + 'static> NativeNumber<NeonInnerTypes<C>> for NeonNumber<C> {
     fn value(&self) -> Result<f64, CubeError> {
         self.object
-            .map_downcast_neon_object::<JsNumber, _, _>(|cx, object| Ok(object.value(cx)))
+            .map_neon_object::<_, _>(|cx, object| Ok(object.value(cx)))?
     }
 }
 
-pub struct NeonBoolean<'cx: 'static, C: Context<'cx>> {
-    object: NeonObject<'cx, C>,
+pub struct NeonBoolean<C: Context<'static>> {
+    object: NeonTypeHandle<C, JsBoolean>,
 }
 
-impl<'cx, C: Context<'cx>> NeonBoolean<'cx, C> {
-    pub fn new(object: NeonObject<'cx, C>) -> Self {
+impl<C: Context<'static>> NeonBoolean<C> {
+    pub fn new(object: NeonTypeHandle<C, JsBoolean>) -> Self {
         Self { object }
     }
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NativeType<NeonInnerTypes<'cx, C>> for NeonBoolean<'cx, C> {
-    fn into_object(self) -> NeonObject<'cx, C> {
-        self.object
+impl<C: Context<'static> + 'static> NativeType<NeonInnerTypes<C>> for NeonBoolean<C> {
+    fn into_object(self) -> NeonObject<C> {
+        self.object.upcast()
     }
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NativeBoolean<NeonInnerTypes<'cx, C>> for NeonBoolean<'cx, C> {
+impl<C: Context<'static> + 'static> NativeBoolean<NeonInnerTypes<C>> for NeonBoolean<C> {
     fn value(&self) -> Result<bool, CubeError> {
         self.object
-            .map_downcast_neon_object::<JsBoolean, _, _>(|cx, object| Ok(object.value(cx)))
+            .map_neon_object::<_, _>(|cx, object| Ok(object.value(cx)))?
+    }
+}
+
+pub struct NeonBox<C: Context<'static>, T: 'static> {
+    object: NeonTypeHandle<C, JsBox<T>>,
+    _marker: PhantomData<T>,
+}
+
+impl<C: Context<'static>, T: 'static> NeonBox<C, T> {
+    pub fn new(object: NeonTypeHandle<C, JsBox<T>>) -> Self {
+        Self {
+            object,
+            _marker: PhantomData,
+        }
+    }
+}
+
+impl<C: Context<'static> + 'static, T: 'static> NativeType<NeonInnerTypes<C>> for NeonBox<C, T> {
+    fn into_object(self) -> NeonObject<C> {
+        self.object.upcast()
+    }
+}
+
+impl<C: Context<'static> + 'static, T: 'static> NativeBox<NeonInnerTypes<C>, T> for NeonBox<C, T> {
+    fn deref_value(&self) -> &T {
+        self.object.get_object_ref().deref()
     }
 }
diff --git a/rust/cubenativeutils/src/wrappers/neon/object/mod.rs b/rust/cubenativeutils/src/wrappers/neon/object/mod.rs
index 40763a228b..751acb6737 100644
--- a/rust/cubenativeutils/src/wrappers/neon/object/mod.rs
+++ b/rust/cubenativeutils/src/wrappers/neon/object/mod.rs
@@ -14,37 +14,46 @@ use crate::wrappers::{neon::context::ContextHolder, object::NativeObject};
 use cubesql::CubeError;
 use neon::prelude::*;
 
-pub struct NeonObject<'cx: 'static, C: Context<'cx>> {
-    context: ContextHolder<'cx, C>,
-    object: Handle<'cx, JsValue>,
+pub struct NeonTypeHandle<C: Context<'static>, V: Value + 'static> {
+    context: ContextHolder<C>,
+    object: Handle<'static, V>,
 }
 
-impl<'cx: 'static, C: Context<'cx> + 'cx> NeonObject<'cx, C> {
-    pub fn new(context: ContextHolder<'cx, C>, object: Handle<'cx, JsValue>) -> Self {
+impl<C: Context<'static> + 'static, V: Value + 'static> NeonTypeHandle<C, V> {
+    pub fn new(context: ContextHolder<C>, object: Handle<'static, V>) -> Self {
         Self { context, object }
     }
 
-    pub fn get_object(&self) -> Handle<'cx, JsValue> {
-        self.object.clone()
+    fn get_context(&self) -> ContextHolder<C> {
+        self.context.clone()
+    }
+
+    pub fn get_object(&self) -> Handle<'static, V> {
+        self.object
     }
 
-    pub fn get_object_ref(&self) -> &Handle<'cx, JsValue> {
+    pub fn get_object_ref(&self) -> &Handle<'static, V> {
         &self.object
     }
 
-    pub fn into_object(self) -> Handle<'cx, JsValue> {
+    pub fn into_object(self) -> Handle<'static, V> {
         self.object
     }
 
-    pub fn map_neon_object<T, F>(&self, f: F) -> T
+    pub fn upcast(&self) -> NeonObject<C> {
+        NeonObject::new(self.context.clone(), self.object.upcast())
+    }
+
+    pub fn map_neon_object<T, F>(&self, f: F) -> Result<T, CubeError>
     where
-        F: FnOnce(&mut C, &Handle<'cx, JsValue>) -> T,
+        F: FnOnce(&mut C, &Handle<'static, V>) -> T,
     {
         self.context.with_context(|cx| f(cx, &self.object))
     }
+
     pub fn map_downcast_neon_object<JT: Value, T, F>(&self, f: F) -> Result<T, CubeError>
     where
-        F: FnOnce(&mut C, &Handle<'cx, JT>) -> Result<T, CubeError>,
+        F: FnOnce(&mut C, &Handle<'static, JT>) -> Result<T, CubeError>,
     {
         self.context.with_context(|cx| {
             let obj = self
@@ -52,84 +61,115 @@ impl<'cx: 'static, C: Context<'cx> + 'cx> NeonObject<'cx, C> {
                 .downcast::<JT, _>(cx)
                 .map_err(|_| CubeError::internal("Downcast error".to_string()))?;
             f(cx, &obj)
-        })
+        })?
+    }
+
+    pub fn is_a<U: Value>(&self) -> Result<bool, CubeError> {
+        self.context.with_context(|cx| self.object.is_a::<U, _>(cx))
+    }
+}
+
+impl<C: Context<'static>, V: Value + 'static> Clone for NeonTypeHandle<C, V> {
+    fn clone(&self) -> Self {
+        Self {
+            context: self.context.clone(),
+            object: self.object,
+        }
+    }
+}
+
+pub struct NeonObject<C: Context<'static>> {
+    context: ContextHolder<C>,
+    object: Handle<'static, JsValue>,
+}
+
+impl<C: Context<'static> + 'static> NeonObject<C> {
+    pub fn new(context: ContextHolder<C>, object: Handle<'static, JsValue>) -> Self {
+        Self { context, object }
+    }
+
+    pub fn get_object(&self) -> Handle<'static, JsValue> {
+        self.object
+    }
+
+    pub fn get_object_ref(&self) -> &Handle<'static, JsValue> {
+        &self.object
+    }
+
+    pub fn into_object(self) -> Handle<'static, JsValue> {
+        self.object
     }
 
-    pub fn is_a<U: Value>(&self) -> bool {
+    pub fn is_a<U: Value>(&self) -> Result<bool, CubeError> {
         self.context.with_context(|cx| self.object.is_a::<U, _>(cx))
     }
+
+    pub fn downcast<U: Value>(&self) -> Result<NeonTypeHandle<C, U>, CubeError> {
+        let obj = self.context.with_context(|cx| {
+            self.object
+                .downcast::<U, _>(cx)
+                .map_err(|_| CubeError::internal("Downcast error".to_string()))
+        })??;
+        Ok(NeonTypeHandle::new(self.context.clone(), obj))
+    }
+
+    pub fn downcast_with_err_msg<U: Value>(
+        &self,
+        msg: &str,
+    ) -> Result<NeonTypeHandle<C, U>, CubeError> {
+        let obj = self.context.with_context(|cx| {
+            self.object
+                .downcast::<U, _>(cx)
+                .map_err(|_| CubeError::internal(msg.to_string()))
+        })??;
+        Ok(NeonTypeHandle::new(self.context.clone(), obj))
+    }
 }
 
-impl<'cx: 'static, C: Context<'cx> + 'cx> NativeObject<NeonInnerTypes<'cx, C>>
-    for NeonObject<'cx, C>
-{
-    fn get_context(&self) -> ContextHolder<'cx, C> {
+impl<C: Context<'static> + 'static> NativeObject<NeonInnerTypes<C>> for NeonObject<C> {
+    fn get_context(&self) -> ContextHolder<C> {
         self.context.clone()
     }
 
-    fn into_struct(self) -> Result<NeonStruct<'cx, C>, CubeError> {
-        if !self.is_a::<JsObject>() {
-            return Err(CubeError::internal(format!(
-                "NeonObject is not the JsObject"
-            )));
-        }
-        Ok(NeonStruct::new(self))
+    fn into_struct(self) -> Result<NeonStruct<C>, CubeError> {
+        let obj = self.downcast_with_err_msg::<JsObject>("NeonObject is not the JsObject")?;
+        Ok(NeonStruct::new(obj))
     }
-    fn into_function(self) -> Result<NeonFunction<'cx, C>, CubeError> {
-        if !self.is_a::<JsFunction>() {
-            return Err(CubeError::internal(format!(
-                "NeonObject is not the JsFunction"
-            )));
-        }
-        Ok(NeonFunction::new(self))
+    fn into_function(self) -> Result<NeonFunction<C>, CubeError> {
+        let obj = self.downcast_with_err_msg::<JsFunction>("NeonObject is not the JsArray")?;
+        Ok(NeonFunction::new(obj))
     }
-    fn into_array(self) -> Result<NeonArray<'cx, C>, CubeError> {
-        if !self.is_a::<JsArray>() {
-            return Err(CubeError::internal(format!(
-                "NeonObject is not the JsArray"
-            )));
-        }
-        Ok(NeonArray::new(self))
+    fn into_array(self) -> Result<NeonArray<C>, CubeError> {
+        let obj = self.downcast_with_err_msg::<JsArray>("NeonObject is not the JsArray")?;
+        Ok(NeonArray::new(obj))
     }
-    fn into_string(self) -> Result<NeonString<'cx, C>, CubeError> {
-        if !self.is_a::<JsString>() {
-            return Err(CubeError::internal(format!(
-                "NeonObject is not the JsString"
-            )));
-        }
-        Ok(NeonString::new(self))
+    fn into_string(self) -> Result<NeonString<C>, CubeError> {
+        let obj = self.downcast_with_err_msg::<JsString>("NeonObject is not the JsString")?;
+        Ok(NeonString::new(obj))
     }
-    fn into_number(self) -> Result<NeonNumber<'cx, C>, CubeError> {
-        if !self.is_a::<JsNumber>() {
-            return Err(CubeError::internal(format!(
-                "NeonObject is not the JsNumber"
-            )));
-        }
-        Ok(NeonNumber::new(self))
+    fn into_number(self) -> Result<NeonNumber<C>, CubeError> {
+        let obj = self.downcast_with_err_msg::<JsNumber>("NeonObject is not the JsNumber")?;
+        Ok(NeonNumber::new(obj))
     }
-    fn into_boolean(self) -> Result<NeonBoolean<'cx, C>, CubeError> {
-        if !self.is_a::<JsBoolean>() {
-            return Err(CubeError::internal(format!(
-                "NeonObject is not the JsBoolean"
-            )));
-        }
-        Ok(NeonBoolean::<C>::new(self))
+    fn into_boolean(self) -> Result<NeonBoolean<C>, CubeError> {
+        let obj = self.downcast_with_err_msg::<JsBoolean>("NeonObject is not the JsBoolean")?;
+        Ok(NeonBoolean::new(obj))
     }
 
-    fn is_null(&self) -> bool {
+    fn is_null(&self) -> Result<bool, CubeError> {
         self.is_a::<JsNull>()
     }
 
-    fn is_undefined(&self) -> bool {
+    fn is_undefined(&self) -> Result<bool, CubeError> {
         self.is_a::<JsUndefined>()
     }
 }
 
-impl<'cx: 'static, C: Context<'cx>> Clone for NeonObject<'cx, C> {
+impl<C: Context<'static>> Clone for NeonObject<C> {
     fn clone(&self) -> Self {
         Self {
             context: self.context.clone(),
-            object: self.object.clone(),
+            object: self.object,
         }
     }
 }
diff --git a/rust/cubenativeutils/src/wrappers/neon/object/neon_array.rs b/rust/cubenativeutils/src/wrappers/neon/object/neon_array.rs
index dc06714227..08dea2a0c1 100644
--- a/rust/cubenativeutils/src/wrappers/neon/object/neon_array.rs
+++ b/rust/cubenativeutils/src/wrappers/neon/object/neon_array.rs
@@ -1,46 +1,40 @@
-use super::NeonObject;
+use super::{NeonObject, NeonTypeHandle};
 use crate::wrappers::{
     neon::inner_types::NeonInnerTypes,
-    object::{NativeArray, NativeObject, NativeType},
+    object::{NativeArray, NativeType},
     object_handle::NativeObjectHandle,
 };
 use cubesql::CubeError;
 use neon::prelude::*;
 
 #[derive(Clone)]
-pub struct NeonArray<'cx: 'static, C: Context<'cx>> {
-    object: NeonObject<'cx, C>,
+pub struct NeonArray<C: Context<'static>> {
+    object: NeonTypeHandle<C, JsArray>,
 }
 
-/* impl<C: Context<'static>> InnerTyped for NeonArray<C> {
-    type Inner = NeonObject<C>;
-} */
-
-impl<'cx, C: Context<'cx> + 'cx> NeonArray<'cx, C> {
-    pub fn new(object: NeonObject<'cx, C>) -> Self {
+impl<C: Context<'static> + 'static> NeonArray<C> {
+    pub fn new(object: NeonTypeHandle<C, JsArray>) -> Self {
         Self { object }
     }
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NativeType<NeonInnerTypes<'cx, C>> for NeonArray<'cx, C> {
-    fn into_object(self) -> NeonObject<'cx, C> {
-        self.object
+impl<C: Context<'static> + 'static> NativeType<NeonInnerTypes<C>> for NeonArray<C> {
+    fn into_object(self) -> NeonObject<C> {
+        self.object.upcast()
     }
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NativeArray<NeonInnerTypes<'cx, C>> for NeonArray<'cx, C> {
+impl<C: Context<'static> + 'static> NativeArray<NeonInnerTypes<C>> for NeonArray<C> {
     fn len(&self) -> Result<u32, CubeError> {
         self.object
-            .map_downcast_neon_object::<JsArray, _, _>(|cx, object| Ok(object.len(cx)))
+            .map_neon_object::<_, _>(|cx, object| Ok(object.len(cx)))?
     }
-    fn to_vec(&self) -> Result<Vec<NativeObjectHandle<NeonInnerTypes<'cx, C>>>, CubeError> {
-        let neon_vec = self
-            .object
-            .map_downcast_neon_object::<JsArray, _, _>(|cx, object| {
-                object
-                    .to_vec(cx)
-                    .map_err(|_| CubeError::internal("Error converting JsArray to Vec".to_string()))
-            })?;
+    fn to_vec(&self) -> Result<Vec<NativeObjectHandle<NeonInnerTypes<C>>>, CubeError> {
+        let neon_vec = self.object.map_neon_object::<_, _>(|cx, object| {
+            object
+                .to_vec(cx)
+                .map_err(|_| CubeError::internal("Error converting JsArray to Vec".to_string()))
+        })??;
 
         Ok(neon_vec
             .into_iter()
@@ -50,24 +44,21 @@ impl<'cx, C: Context<'cx> + 'cx> NativeArray<NeonInnerTypes<'cx, C>> for NeonArr
     fn set(
         &self,
         index: u32,
-        value: NativeObjectHandle<NeonInnerTypes<'cx, C>>,
+        value: NativeObjectHandle<NeonInnerTypes<C>>,
     ) -> Result<bool, CubeError> {
         let value = value.into_object().into_object();
-        self.object
-            .map_downcast_neon_object::<JsArray, _, _>(|cx, object| {
-                object
-                    .set(cx, index, value)
-                    .map_err(|_| CubeError::internal(format!("Error setting index {}", index)))
-            })
+        self.object.map_neon_object::<_, _>(|cx, object| {
+            object
+                .set(cx, index, value)
+                .map_err(|_| CubeError::internal(format!("Error setting index {}", index)))
+        })?
     }
-    fn get(&self, index: u32) -> Result<NativeObjectHandle<NeonInnerTypes<'cx, C>>, CubeError> {
-        let r = self
-            .object
-            .map_downcast_neon_object::<JsArray, _, _>(|cx, object| {
-                object
-                    .get(cx, index)
-                    .map_err(|_| CubeError::internal(format!("Error setting index {}", index)))
-            })?;
+    fn get(&self, index: u32) -> Result<NativeObjectHandle<NeonInnerTypes<C>>, CubeError> {
+        let r = self.object.map_neon_object::<_, _>(|cx, object| {
+            object
+                .get(cx, index)
+                .map_err(|_| CubeError::internal(format!("Error setting index {}", index)))
+        })??;
         Ok(NativeObjectHandle::new(NeonObject::new(
             self.object.get_context(),
             r,
diff --git a/rust/cubenativeutils/src/wrappers/neon/object/neon_function.rs b/rust/cubenativeutils/src/wrappers/neon/object/neon_function.rs
index c8fc68d372..216b6852f6 100644
--- a/rust/cubenativeutils/src/wrappers/neon/object/neon_function.rs
+++ b/rust/cubenativeutils/src/wrappers/neon/object/neon_function.rs
@@ -1,4 +1,4 @@
-use super::NeonObject;
+use super::{NeonObject, NeonTypeHandle};
 use crate::wrappers::{
     neon::inner_types::NeonInnerTypes,
     object::{NativeFunction, NativeType},
@@ -10,39 +10,37 @@ use neon::prelude::*;
 use regex::Regex;
 
 #[derive(Clone)]
-pub struct NeonFunction<'cx: 'static, C: Context<'cx>> {
-    object: NeonObject<'cx, C>,
+pub struct NeonFunction<C: Context<'static>> {
+    object: NeonTypeHandle<C, JsFunction>,
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NeonFunction<'cx, C> {
-    pub fn new(object: NeonObject<'cx, C>) -> Self {
+impl<C: Context<'static> + 'static> NeonFunction<C> {
+    pub fn new(object: NeonTypeHandle<C, JsFunction>) -> Self {
         Self { object }
     }
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NativeType<NeonInnerTypes<'cx, C>> for NeonFunction<'cx, C> {
-    fn into_object(self) -> NeonObject<'cx, C> {
-        self.object
+impl<C: Context<'static> + 'static> NativeType<NeonInnerTypes<C>> for NeonFunction<C> {
+    fn into_object(self) -> NeonObject<C> {
+        self.object.upcast()
     }
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NativeFunction<NeonInnerTypes<'cx, C>> for NeonFunction<'cx, C> {
+impl<C: Context<'static> + 'static> NativeFunction<NeonInnerTypes<C>> for NeonFunction<C> {
     fn call(
         &self,
-        args: Vec<NativeObjectHandle<NeonInnerTypes<'cx, C>>>,
-    ) -> Result<NativeObjectHandle<NeonInnerTypes<'cx, C>>, CubeError> {
+        args: Vec<NativeObjectHandle<NeonInnerTypes<C>>>,
+    ) -> Result<NativeObjectHandle<NeonInnerTypes<C>>, CubeError> {
         let neon_args = args
             .into_iter()
             .map(|arg| -> Result<_, CubeError> { Ok(arg.into_object().get_object()) })
             .collect::<Result<Vec<_>, _>>()?;
         let neon_reuslt = self.object.map_neon_object(|cx, neon_object| {
-            let this = neon_object
-                .downcast::<JsFunction, _>(cx)
-                .map_err(|_| CubeError::internal(format!("Neon object is not JsFunction")))?;
             let null = cx.null();
-            this.call(cx, null, neon_args)
-                .map_err(|_| CubeError::internal(format!("Failed to call function ")))
-        })?;
+            neon_object
+                .call(cx, null, neon_args)
+                .map_err(|_| CubeError::internal("Failed to call function ".to_string()))
+        })??;
         Ok(NativeObjectHandle::new(NeonObject::new(
             self.object.context.clone(),
             neon_reuslt,
@@ -53,17 +51,14 @@ impl<'cx, C: Context<'cx> + 'cx> NativeFunction<NeonInnerTypes<'cx, C>> for Neon
         let result =
             self.object
                 .map_neon_object(|cx, neon_object| -> Result<String, CubeError> {
-                    let this = neon_object.downcast::<JsFunction, _>(cx).map_err(|_| {
-                        CubeError::internal(format!("Neon object is not JsFunction"))
-                    })?;
-                    let res = this
+                    let res = neon_object
                         .to_string(cx)
                         .map_err(|_| {
-                            CubeError::internal(format!("Can't convert function to string"))
+                            CubeError::internal("Can't convert function to string".to_string())
                         })?
                         .value(cx);
                     Ok(res)
-                })?;
+                })??;
         Ok(result)
     }
 
diff --git a/rust/cubenativeutils/src/wrappers/neon/object/neon_struct.rs b/rust/cubenativeutils/src/wrappers/neon/object/neon_struct.rs
index 693c19aeb1..a5446b6fa4 100644
--- a/rust/cubenativeutils/src/wrappers/neon/object/neon_struct.rs
+++ b/rust/cubenativeutils/src/wrappers/neon/object/neon_struct.rs
@@ -1,4 +1,4 @@
-use super::NeonObject;
+use super::{NeonObject, NeonTypeHandle};
 use crate::wrappers::{
     neon::inner_types::NeonInnerTypes,
     object::{NativeStruct, NativeType},
@@ -8,34 +8,32 @@ use cubesql::CubeError;
 use neon::prelude::*;
 
 #[derive(Clone)]
-pub struct NeonStruct<'cx: 'static, C: Context<'cx>> {
-    object: NeonObject<'cx, C>,
+pub struct NeonStruct<C: Context<'static>> {
+    object: NeonTypeHandle<C, JsObject>,
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NeonStruct<'cx, C> {
-    pub fn new(object: NeonObject<'cx, C>) -> Self {
+impl<C: Context<'static> + 'static> NeonStruct<C> {
+    pub fn new(object: NeonTypeHandle<C, JsObject>) -> Self {
         Self { object }
     }
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NativeType<NeonInnerTypes<'cx, C>> for NeonStruct<'cx, C> {
-    fn into_object(self) -> NeonObject<'cx, C> {
-        self.object
+impl<C: Context<'static> + 'static> NativeType<NeonInnerTypes<C>> for NeonStruct<C> {
+    fn into_object(self) -> NeonObject<C> {
+        self.object.upcast()
     }
 }
 
-impl<'cx, C: Context<'cx> + 'cx> NativeStruct<NeonInnerTypes<'cx, C>> for NeonStruct<'cx, C> {
+impl<C: Context<'static> + 'static> NativeStruct<NeonInnerTypes<C>> for NeonStruct<C> {
     fn get_field(
         &self,
         field_name: &str,
-    ) -> Result<NativeObjectHandle<NeonInnerTypes<'cx, C>>, CubeError> {
+    ) -> Result<NativeObjectHandle<NeonInnerTypes<C>>, CubeError> {
         let neon_result = self.object.map_neon_object(|cx, neon_object| {
-            let this = neon_object
-                .downcast::<JsObject, _>(cx)
-                .map_err(|_| CubeError::internal(format!("Neon object is not JsObject")))?;
-            this.get::<JsValue, _, _>(cx, field_name)
+            neon_object
+                .get::<JsValue, _, _>(cx, field_name)
                 .map_err(|_| CubeError::internal(format!("Field `{}` not found", field_name)))
-        })?;
+        })??;
         Ok(NativeObjectHandle::new(NeonObject::new(
             self.object.context.clone(),
             neon_result,
@@ -43,54 +41,47 @@ impl<'cx, C: Context<'cx> + 'cx> NativeStruct<NeonInnerTypes<'cx, C>> for NeonSt
     }
 
     fn has_field(&self, field_name: &str) -> Result<bool, CubeError> {
-        let result = self
-            .object
-            .map_neon_object(|cx, neon_object| -> Result<bool, CubeError> {
-                let this = neon_object
-                    .downcast::<JsObject, _>(cx)
-                    .map_err(|_| CubeError::internal(format!("Neon object is not JsObject")))?;
-                let res = this
-                    .get_opt::<JsValue, _, _>(cx, field_name)
-                    .map_err(|_| {
-                        CubeError::internal(format!(
-                            "Error while getting field `{}` not found",
-                            field_name
-                        ))
-                    })?
-                    .is_some();
-                Ok(res)
-            })?;
+        let result =
+            self.object
+                .map_neon_object(|cx, neon_object| -> Result<bool, CubeError> {
+                    let res = neon_object
+                        .get_opt::<JsValue, _, _>(cx, field_name)
+                        .map_err(|_| {
+                            CubeError::internal(format!(
+                                "Error while getting field `{}` not found",
+                                field_name
+                            ))
+                        })?
+                        .is_some();
+                    Ok(res)
+                })??;
         Ok(result)
     }
 
     fn set_field(
         &self,
         field_name: &str,
-        value: NativeObjectHandle<NeonInnerTypes<'cx, C>>,
+        value: NativeObjectHandle<NeonInnerTypes<C>>,
     ) -> Result<bool, CubeError> {
         let value = value.into_object().into_object();
-        self.object
-            .map_downcast_neon_object::<JsObject, _, _>(|cx, object| {
-                object
-                    .set(cx, field_name, value)
-                    .map_err(|_| CubeError::internal(format!("Error setting field {}", field_name)))
-            })
+        self.object.map_neon_object::<_, _>(|cx, object| {
+            object
+                .set(cx, field_name, value)
+                .map_err(|_| CubeError::internal(format!("Error setting field {}", field_name)))
+        })?
     }
     fn get_own_property_names(
         &self,
-    ) -> Result<Vec<NativeObjectHandle<NeonInnerTypes<'cx, C>>>, CubeError> {
+    ) -> Result<Vec<NativeObjectHandle<NeonInnerTypes<C>>>, CubeError> {
         let neon_array = self.object.map_neon_object(|cx, neon_object| {
-            let this = neon_object
-                .downcast::<JsObject, _>(cx)
-                .map_err(|_| CubeError::internal(format!("Neon object is not JsObject")))?;
-            let neon_array = this
-                .get_own_property_names(cx)
-                .map_err(|_| CubeError::internal(format!("Cannot get own properties not found")))?;
+            let neon_array = neon_object.get_own_property_names(cx).map_err(|_| {
+                CubeError::internal("Cannot get own properties not found".to_string())
+            })?;
 
             neon_array
                 .to_vec(cx)
-                .map_err(|_| CubeError::internal(format!("Failed to convert array")))
-        })?;
+                .map_err(|_| CubeError::internal("Failed to convert array".to_string()))
+        })??;
         Ok(neon_array
             .into_iter()
             .map(|o| NativeObjectHandle::new(NeonObject::new(self.object.context.clone(), o)))
@@ -99,27 +90,26 @@ impl<'cx, C: Context<'cx> + 'cx> NativeStruct<NeonInnerTypes<'cx, C>> for NeonSt
     fn call_method(
         &self,
         method: &str,
-        args: Vec<NativeObjectHandle<NeonInnerTypes<'cx, C>>>,
-    ) -> Result<NativeObjectHandle<NeonInnerTypes<'cx, C>>, CubeError> {
+        args: Vec<NativeObjectHandle<NeonInnerTypes<C>>>,
+    ) -> Result<NativeObjectHandle<NeonInnerTypes<C>>, CubeError> {
         let neon_args = args
             .into_iter()
             .map(|arg| -> Result<_, CubeError> { Ok(arg.into_object().get_object()) })
             .collect::<Result<Vec<_>, _>>()?;
 
         let neon_reuslt = self.object.map_neon_object(|cx, neon_object| {
-            let this = neon_object
-                .downcast::<JsObject, _>(cx)
-                .map_err(|_| CubeError::internal(format!("Neon object is not JsObject")))?;
-            let neon_method = this
+            let neon_method = neon_object
                 .get::<JsFunction, _, _>(cx, method)
                 .map_err(|_| CubeError::internal(format!("Method `{}` not found", method)))?;
-            neon_method.call(cx, this, neon_args).map_err(|err| {
-                CubeError::internal(format!(
-                    "Failed to call method `{} {} {:?}",
-                    method, err, err
-                ))
-            })
-        })?;
+            neon_method
+                .call(cx, *neon_object, neon_args)
+                .map_err(|err| {
+                    CubeError::internal(format!(
+                        "Failed to call method `{} {} {:?}",
+                        method, err, err
+                    ))
+                })
+        })??;
         Ok(NativeObjectHandle::new(NeonObject::new(
             self.object.context.clone(),
             neon_reuslt,
diff --git a/rust/cubenativeutils/src/wrappers/object.rs b/rust/cubenativeutils/src/wrappers/object.rs
index bee3275ea3..401a0b35c2 100644
--- a/rust/cubenativeutils/src/wrappers/object.rs
+++ b/rust/cubenativeutils/src/wrappers/object.rs
@@ -10,8 +10,8 @@ pub trait NativeObject<IT: InnerTypes>: Clone {
     fn into_number(self) -> Result<IT::Number, CubeError>;
     fn into_boolean(self) -> Result<IT::Boolean, CubeError>;
     fn into_function(self) -> Result<IT::Function, CubeError>;
-    fn is_null(&self) -> bool;
-    fn is_undefined(&self) -> bool;
+    fn is_null(&self) -> Result<bool, CubeError>;
+    fn is_undefined(&self) -> Result<bool, CubeError>;
 }
 
 pub trait NativeType<IT: InnerTypes> {
@@ -56,3 +56,7 @@ pub trait NativeNumber<IT: InnerTypes>: NativeType<IT> {
 pub trait NativeBoolean<IT: InnerTypes>: NativeType<IT> {
     fn value(&self) -> Result<bool, CubeError>;
 }
+
+pub trait NativeBox<IT: InnerTypes, T: 'static>: NativeType<IT> {
+    fn deref_value(&self) -> &T;
+}
diff --git a/rust/cubenativeutils/src/wrappers/object_handle.rs b/rust/cubenativeutils/src/wrappers/object_handle.rs
index 501c16e356..93429cacbc 100644
--- a/rust/cubenativeutils/src/wrappers/object_handle.rs
+++ b/rust/cubenativeutils/src/wrappers/object_handle.rs
@@ -55,13 +55,12 @@ impl<IT: InnerTypes> NativeObjectHandle<IT> {
     pub fn to_boolean(&self) -> Result<IT::Boolean, CubeError> {
         self.object.clone().into_boolean()
     }
-    pub fn is_null(&self) -> bool {
+    pub fn is_null(&self) -> Result<bool, CubeError> {
         self.object.is_null()
     }
-    pub fn is_undefined(&self) -> bool {
+    pub fn is_undefined(&self) -> Result<bool, CubeError> {
         self.object.is_undefined()
     }
-
     pub fn get_context(&self) -> IT::Context {
         self.object.get_context()
     }
diff --git a/rust/cubenativeutils/src/wrappers/serializer/deserializer.rs b/rust/cubenativeutils/src/wrappers/serializer/deserializer.rs
index 9f3cc78582..d3e0640103 100644
--- a/rust/cubenativeutils/src/wrappers/serializer/deserializer.rs
+++ b/rust/cubenativeutils/src/wrappers/serializer/deserializer.rs
@@ -33,7 +33,7 @@ impl<'de, IT: InnerTypes> Deserializer<'de> for NativeSerdeDeserializer<IT> {
     where
         V: Visitor<'de>,
     {
-        if self.input.is_null() || self.input.is_undefined() {
+        if self.input.is_null()? || self.input.is_undefined()? {
             visitor.visit_unit()
         } else if let Ok(val) = self.input.to_boolean() {
             visitor.visit_bool(val.value().unwrap())
@@ -58,7 +58,7 @@ impl<'de, IT: InnerTypes> Deserializer<'de> for NativeSerdeDeserializer<IT> {
     where
         V: Visitor<'de>,
     {
-        if self.input.is_null() || self.input.is_undefined() {
+        if self.input.is_null()? || self.input.is_undefined()? {
             visitor.visit_none()
         } else {
             visitor.visit_some(self)
@@ -123,7 +123,7 @@ impl<'de, IT: InnerTypes> Deserializer<'de> for NativeSerdeDeserializer<IT> {
         V: Visitor<'de>,
     {
         if let Ok(val) = self.input.to_number() {
-            visitor.visit_f64(val.value().unwrap() as f64)
+            visitor.visit_f64(val.value().unwrap())
         } else {
             Err(NativeObjSerializerError::Message(
                 "JS Number expected for f64 field".to_string(),
@@ -178,7 +178,7 @@ struct NativeMapDeserializer<IT: InnerTypes> {
 impl<IT: InnerTypes> NativeMapDeserializer<IT> {
     pub fn new(input: IT::Struct) -> Result<Self, NativeObjSerializerError> {
         let prop_names = input.get_own_property_names().map_err(|_| {
-            NativeObjSerializerError::Message(format!("Failed to get property names"))
+            NativeObjSerializerError::Message("Failed to get property names".to_string())
         })?;
         let len = prop_names.len() as u32;
         Ok(Self {
@@ -214,23 +214,23 @@ impl<'de, IT: InnerTypes> MapAccess<'de> for NativeMapDeserializer<IT> {
         V: DeserializeSeed<'de>,
     {
         if self.value_idx >= self.len {
-            return Err(NativeObjSerializerError::Message(format!(
-                "Array index out of bounds"
-            )));
+            return Err(NativeObjSerializerError::Message(
+                "Array index out of bounds".to_string(),
+            ));
         }
         let prop_name = self
             .prop_names
             .get(self.value_idx as usize)
             .ok_or_else(|| {
-                NativeObjSerializerError::Message(format!("Array index out of bounds"))
+                NativeObjSerializerError::Message("Array index out of bounds".to_string())
             })?;
         let prop_string = prop_name
             .to_string()
             .and_then(|s| s.value())
-            .map_err(|_| NativeObjSerializerError::Message(format!("key should be string")))?;
+            .map_err(|_| NativeObjSerializerError::Message("key should be string".to_string()))?;
 
         let value = self.input.get_field(&prop_string).map_err(|_| {
-            NativeObjSerializerError::Message(format!("Failed to get property name"))
+            NativeObjSerializerError::Message("Failed to get property name".to_string())
         })?;
 
         self.value_idx += 1;
diff --git a/rust/cubenativeutils/src/wrappers/serializer/error.rs b/rust/cubenativeutils/src/wrappers/serializer/error.rs
index 50e55c88da..2b27014cf1 100644
--- a/rust/cubenativeutils/src/wrappers/serializer/error.rs
+++ b/rust/cubenativeutils/src/wrappers/serializer/error.rs
@@ -1,3 +1,4 @@
+use cubesql::CubeError;
 use serde::{de, ser};
 use std::{fmt, fmt::Display};
 #[derive(Debug)]
@@ -26,3 +27,9 @@ impl Display for NativeObjSerializerError {
 }
 
 impl std::error::Error for NativeObjSerializerError {}
+
+impl From<CubeError> for NativeObjSerializerError {
+    fn from(value: CubeError) -> Self {
+        Self::Message(value.to_string())
+    }
+}
diff --git a/rust/cubenativeutils/src/wrappers/serializer/serializer.rs b/rust/cubenativeutils/src/wrappers/serializer/serializer.rs
index 21463875cd..6570df1e3f 100644
--- a/rust/cubenativeutils/src/wrappers/serializer/serializer.rs
+++ b/rust/cubenativeutils/src/wrappers/serializer/serializer.rs
@@ -55,79 +55,79 @@ impl<IT: InnerTypes> ser::Serializer for NativeSerdeSerializer<IT> {
 
     fn serialize_bool(self, v: bool) -> Result<Self::Ok, Self::Error> {
         Ok(NativeObjectHandle::new(
-            self.context.boolean(v).into_object(),
+            self.context.boolean(v)?.into_object(),
         ))
     }
 
     fn serialize_i8(self, v: i8) -> Result<Self::Ok, Self::Error> {
         Ok(NativeObjectHandle::new(
-            self.context.number(v as f64).into_object(),
+            self.context.number(v as f64)?.into_object(),
         ))
     }
 
     fn serialize_i16(self, v: i16) -> Result<Self::Ok, Self::Error> {
         Ok(NativeObjectHandle::new(
-            self.context.number(v as f64).into_object(),
+            self.context.number(v as f64)?.into_object(),
         ))
     }
 
     fn serialize_i32(self, v: i32) -> Result<Self::Ok, Self::Error> {
         Ok(NativeObjectHandle::new(
-            self.context.number(v as f64).into_object(),
+            self.context.number(v as f64)?.into_object(),
         ))
     }
 
     fn serialize_i64(self, v: i64) -> Result<Self::Ok, Self::Error> {
         Ok(NativeObjectHandle::new(
-            self.context.number(v as f64).into_object(),
+            self.context.number(v as f64)?.into_object(),
         ))
     }
 
     fn serialize_u8(self, v: u8) -> Result<Self::Ok, Self::Error> {
         Ok(NativeObjectHandle::new(
-            self.context.number(v as f64).into_object(),
+            self.context.number(v as f64)?.into_object(),
         ))
     }
 
     fn serialize_u16(self, v: u16) -> Result<Self::Ok, Self::Error> {
         Ok(NativeObjectHandle::new(
-            self.context.number(v as f64).into_object(),
+            self.context.number(v as f64)?.into_object(),
         ))
     }
 
     fn serialize_u32(self, v: u32) -> Result<Self::Ok, Self::Error> {
         Ok(NativeObjectHandle::new(
-            self.context.number(v as f64).into_object(),
+            self.context.number(v as f64)?.into_object(),
         ))
     }
 
     fn serialize_u64(self, v: u64) -> Result<Self::Ok, Self::Error> {
         Ok(NativeObjectHandle::new(
-            self.context.number(v as f64).into_object(),
+            self.context.number(v as f64)?.into_object(),
         ))
     }
 
     fn serialize_f32(self, v: f32) -> Result<Self::Ok, Self::Error> {
         Ok(NativeObjectHandle::new(
-            self.context.number(v as f64).into_object(),
+            self.context.number(v as f64)?.into_object(),
         ))
     }
 
     fn serialize_f64(self, v: f64) -> Result<Self::Ok, Self::Error> {
         Ok(NativeObjectHandle::new(
-            self.context.number(v as f64).into_object(),
+            self.context.number(v)?.into_object(),
         ))
     }
 
     fn serialize_char(self, v: char) -> Result<Self::Ok, Self::Error> {
         Ok(NativeObjectHandle::new(
-            self.context.string(String::from(v)).into_object(),
+            self.context.string(String::from(v))?.into_object(),
         ))
     }
 
     fn serialize_str(self, v: &str) -> Result<Self::Ok, Self::Error> {
         Ok(NativeObjectHandle::new(
-            self.context.string(String::from(v)).into_object(),
+            self.context.string(String::from(v))?.into_object(),
         ))
     }
 
@@ -138,7 +138,7 @@ impl<IT: InnerTypes> ser::Serializer for NativeSerdeSerializer<IT> {
     }
 
     fn serialize_none(self) -> Result<Self::Ok, Self::Error> {
-        Ok(self.context.undefined())
+        Ok(self.context.undefined()?)
     }
 
     fn serialize_some<T>(self, value: &T) -> Result<Self::Ok, Self::Error>
@@ -149,11 +149,11 @@ impl<IT: InnerTypes> ser::Serializer for NativeSerdeSerializer<IT> {
     }
 
     fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {
-        Ok(self.context.undefined())
+        Ok(self.context.undefined()?)
     }
 
     fn serialize_unit_struct(self, _name: &'static str) -> Result<Self::Ok, Self::Error> {
-        Ok(self.context.undefined())
+        Ok(self.context.undefined()?)
     }
 
     fn serialize_unit_variant(
@@ -185,18 +185,16 @@ impl<IT: InnerTypes> ser::Serializer for NativeSerdeSerializer<IT> {
         _name: &'static str,
         _variant_index: u32,
         _variant: &'static str,
-        _value: &T,
+        value: &T,
     ) -> Result<Self::Ok, Self::Error>
     where
         T: ?Sized + Serialize,
     {
-        Err(NativeObjSerializerError::Message(
-            "serialize_newtype_variant is not implemented".to_string(),
-        ))
+        NativeSerdeSerializer::serialize(value, self.context.clone())
     }
 
     fn serialize_seq(self, _len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
-        let seq = self.context.empty_array();
+        let seq = self.context.empty_array()?;
 
         Ok(NativeSeqSerializer {
             context: self.context.clone(),
@@ -234,7 +232,7 @@ impl<IT: InnerTypes> ser::Serializer for NativeSerdeSerializer<IT> {
     }
 
     fn serialize_map(self, _len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
-        let obj = self.context.empty_struct();
+        let obj = self.context.empty_struct()?;
         Ok(NativeMapSerializer {
             context: self.context.clone(),
             obj,
@@ -246,7 +244,7 @@ impl<IT: InnerTypes> ser::Serializer for NativeSerdeSerializer<IT> {
         _name: &'static str,
         _len: usize,
     ) -> Result<Self::SerializeStruct, Self::Error> {
-        let obj = self.context.empty_struct();
+        let obj = self.context.empty_struct()?;
         Ok(NativeMapSerializer {
             context: self.context.clone(),
             obj,
diff --git a/rust/cubeorchestrator/Cargo.lock b/rust/cubeorchestrator/Cargo.lock
index f4a1156cff..35a40dd365 100644
--- a/rust/cubeorchestrator/Cargo.lock
+++ b/rust/cubeorchestrator/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -341,18 +341,18 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.215"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/rust/cubeorchestrator/Cargo.toml b/rust/cubeorchestrator/Cargo.toml
index 0605d4608a..140932619d 100644
--- a/rust/cubeorchestrator/Cargo.toml
+++ b/rust/cubeorchestrator/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 chrono = { version = "0.4.31", features = ["serde"] }
 cubeshared = { path = "../cubeshared" }
-serde = { version = "1.0.215", features = ["derive"] }
+serde = { version = "1.0.217", features = ["derive"] }
 serde_json = "1.0.133"
 anyhow = "1.0"
 itertools = "0.13.0"
diff --git a/rust/cubeorchestrator/rust-toolchain.toml b/rust/cubeorchestrator/rust-toolchain.toml
index 040357e9b1..d9f5179de3 100644
--- a/rust/cubeorchestrator/rust-toolchain.toml
+++ b/rust/cubeorchestrator/rust-toolchain.toml
@@ -1,5 +1,4 @@
 [toolchain]
-#channel = "stable"
-channel = "nightly-2024-07-15"
+channel = "1.84.1"
 components = ["rustfmt", "clippy"]
 profile = "minimal"
diff --git a/rust/cubeorchestrator/src/transport.rs b/rust/cubeorchestrator/src/transport.rs
index 5bcd358a28..b45ea96c4d 100644
--- a/rust/cubeorchestrator/src/transport.rs
+++ b/rust/cubeorchestrator/src/transport.rs
@@ -82,6 +82,13 @@ pub struct GroupingSet {
     pub sub_id: Option<u32>,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum CompareDateRangeType {
+    Single(Vec<String>),
+    Multi(Vec<Vec<String>>),
+}
+
 // We can do nothing with JS functions here,
 // but to keep DTOs in sync with reality, let's keep it.
 pub type JsFunction = String;
@@ -120,7 +127,7 @@ pub struct ParsedMemberExpression {
 pub struct QueryTimeDimension {
     pub dimension: String,
     pub date_range: Option<Vec<String>>,
-    pub compare_date_range: Option<Vec<String>>,
+    pub compare_date_range: Option<CompareDateRangeType>,
     pub granularity: Option<String>,
 }
 
@@ -161,6 +168,8 @@ pub struct ConfigItem {
     pub drill_members_grouped: Option<DrillMembersGrouped>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub granularities: Option<Vec<GranularityMeta>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub granularity: Option<GranularityMeta>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
diff --git a/rust/cubeshared/rust-toolchain.toml b/rust/cubeshared/rust-toolchain.toml
index 040357e9b1..d9f5179de3 100644
--- a/rust/cubeshared/rust-toolchain.toml
+++ b/rust/cubeshared/rust-toolchain.toml
@@ -1,5 +1,4 @@
 [toolchain]
-#channel = "stable"
-channel = "nightly-2024-07-15"
+channel = "1.84.1"
 components = ["rustfmt", "clippy"]
 profile = "minimal"
diff --git a/rust/cubesql/.cargo/config.toml b/rust/cubesql/.cargo/config.toml
index 8d85301d2d..c5a642cb11 100644
--- a/rust/cubesql/.cargo/config.toml
+++ b/rust/cubesql/.cargo/config.toml
@@ -1,11 +1,5 @@
 # Please keep in sync this file with packages/cubejs-backend-native!
 
-[target."x86_64-unknown-linux-gnu"]
-rustflags = ["-C", "link-arg=-fuse-ld=lld"]
-
-[target."aarch64-unknown-linux-gnu"]
-rustflags = ["-C", "link-arg=-fuse-ld=lld"]
-
 # If you are going to use local fork, feel free to uncomment
 #paths = ["../../../sqlparser-rs", "../../../arrow-datafusion/datafusion"]
 #paths = ["../../../arrow-datafusion/datafusion"]
diff --git a/rust/cubesql/CHANGELOG.md b/rust/cubesql/CHANGELOG.md
index 225749d2d2..264f98eaff 100644
--- a/rust/cubesql/CHANGELOG.md
+++ b/rust/cubesql/CHANGELOG.md
@@ -3,6 +3,89 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/cubesql
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+### Bug Fixes
+
+- **cubesql:** Split `__user` WHERE predicate into separate filter node ([#8812](https://github.com/cube-js/cube/issues/8812)) ([83baf7b](https://github.com/cube-js/cube/commit/83baf7bf5f83108fd6c3dd134a8739968e781f92))
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+### Bug Fixes
+
+- **cubesql:** Generate typed null literals ([#9238](https://github.com/cube-js/cube/issues/9238)) ([1dfa10d](https://github.com/cube-js/cube/commit/1dfa10d7128841f24c5d94cd1c5bdd2c742ff9de))
+- **cubesql:** Match CubeScan timestamp literal types to member types ([#9275](https://github.com/cube-js/cube/issues/9275)) ([4a4e82b](https://github.com/cube-js/cube/commit/4a4e82ba602fc024a262a22ac65e3fcb7a4bba5c))
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+### Bug Fixes
+
+- **cubesql:** Break cost symmetry for (non)-push-to-Cube WrappedSelect ([#9155](https://github.com/cube-js/cube/issues/9155)) ([2c0e443](https://github.com/cube-js/cube/commit/2c0e443dc18379490e35a3d83b3888f66e12ade0))
+- **cubesql:** Generate proper projection wrapper for duplicated members in CubeScanNode ([#9233](https://github.com/cube-js/cube/issues/9233)) ([aba6430](https://github.com/cube-js/cube/commit/aba643082acc440cf5b3fe9828c2c38ac1a833c9))
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+### Bug Fixes
+
+- **schema-compiler:** Fix sql generation for rolling_window queries with multiple time dimensions ([#9124](https://github.com/cube-js/cube/issues/9124)) ([52a664e](https://github.com/cube-js/cube/commit/52a664e4d0643d78464f75cc48c4a1f686455ebe))
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/cubesql
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+### Features
+
+- **cubeclient:** Add `short_title` to dimensions and measures ([#9256](https://github.com/cube-js/cube/issues/9256)) ([584b3dc](https://github.com/cube-js/cube/commit/584b3dcefedb7c01b849e7f18a59445bd3542b7e))
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/cubesql
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+### Bug Fixes
+
+- **schema-compiler:** Correct models transpilation in native in multitenant environments ([#9234](https://github.com/cube-js/cube/issues/9234)) ([84f90c0](https://github.com/cube-js/cube/commit/84f90c07ee3827e6f3652dd6c9fab0993ecc8150))
+
+### Performance Improvements
+
+- **cubesql:** Avoid allocations in MetaContext methods ([#9228](https://github.com/cube-js/cube/issues/9228)) ([ba753d0](https://github.com/cube-js/cube/commit/ba753d0d43927b50d5cf8faf5f09de3e53bec3db))
+
+## [1.2.4](/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+### Features
+
+- **cubesql:** Add projection flattening rule (#9165) 8cfb253, closes #9165
+- **cubesql:** Allow providing API type when getting load request meta (#9202) ae5d977, closes #9202
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/cubesql
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/cubesql
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+### Bug Fixes
+
+- **cubesql:** Avoid panics during filter rewrites ([#9166](https://github.com/cube-js/cube/issues/9166)) ([4c8de88](https://github.com/cube-js/cube/commit/4c8de882b3cc57e2b0c29c33ca4ee91377176e85))
+- **databricks-jdbc-driver:** Fix extract epoch from timestamp SQL Generation ([#9160](https://github.com/cube-js/cube/issues/9160)) ([9a73857](https://github.com/cube-js/cube/commit/9a73857b4abc5691b44b8a395176a565cdbf1b2a))
+
+### Features
+
+- **cubeclient:** Add hierarchies to Cube meta ([#9180](https://github.com/cube-js/cube/issues/9180)) ([56dbf9e](https://github.com/cube-js/cube/commit/56dbf9edc8c257cd81f00ff119b12543652b76d0))
+- **cubesql:** Add filter flattening rule ([#9148](https://github.com/cube-js/cube/issues/9148)) ([92a4b8e](https://github.com/cube-js/cube/commit/92a4b8e0e65c05f2ca0a683387d3f4434c358fc6))
+- **cubesql:** Add separate ungrouped_scan flag to wrapper replacer context ([#9120](https://github.com/cube-js/cube/issues/9120)) ([50bdbe7](https://github.com/cube-js/cube/commit/50bdbe7f52f653680e32d26c96c41f10e459c341))
+- Support complex join conditions for grouped joins ([#9157](https://github.com/cube-js/cube/issues/9157)) ([28c1e3b](https://github.com/cube-js/cube/commit/28c1e3bba7a100f3152bfdefd86197e818fac941))
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Features
diff --git a/rust/cubesql/Cargo.lock b/rust/cubesql/Cargo.lock
index 51c26fde43..1ec05d6134 100644
--- a/rust/cubesql/Cargo.lock
+++ b/rust/cubesql/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -23,7 +23,7 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.14",
  "once_cell",
  "version_check",
 ]
@@ -34,7 +34,7 @@ version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -222,7 +222,7 @@ checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
 dependencies = [
  "addr2line",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
@@ -299,7 +299,7 @@ dependencies = [
  "arrayref",
  "arrayvec",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "constant_time_eq",
  "digest",
 ]
@@ -358,9 +358,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.9.1"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -392,28 +392,28 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "0.1.10"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "cfg-if"
-version = "1.0.0"
+name = "cfg_aliases"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.31"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
  "wasm-bindgen",
- "windows-targets 0.48.1",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -570,7 +570,7 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -585,7 +585,7 @@ dependencies = [
  "ciborium",
  "clap",
  "criterion-plot",
- "itertools",
+ "itertools 0.10.3",
  "lazy_static",
  "num-traits",
  "oorandom",
@@ -606,7 +606,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
 dependencies = [
  "cast",
- "itertools",
+ "itertools 0.10.3",
 ]
 
 [[package]]
@@ -615,7 +615,7 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
 ]
 
@@ -625,7 +625,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
@@ -637,7 +637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"
 dependencies = [
  "autocfg",
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
  "lazy_static",
  "memoffset",
@@ -650,7 +650,7 @@ version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "lazy_static",
 ]
 
@@ -751,7 +751,6 @@ dependencies = [
 name = "cubesql"
 version = "0.28.0"
 dependencies = [
- "anyhow",
  "arc-swap",
  "async-stream",
  "async-trait",
@@ -759,13 +758,11 @@ dependencies = [
  "bigdecimal",
  "bincode",
  "bitflags 1.3.2",
- "byteorder",
  "bytes",
  "chrono",
  "chrono-tz",
  "comfy-table 7.1.0",
  "criterion",
- "csv",
  "cubeclient",
  "datafusion",
  "egg",
@@ -775,11 +772,10 @@ dependencies = [
  "hashbrown 0.14.3",
  "indexmap 1.9.3",
  "insta",
- "itertools",
+ "itertools 0.14.0",
  "log",
  "lru",
  "minijinja",
- "mockall",
  "paste",
  "pg-srv",
  "pg_interval",
@@ -794,10 +790,9 @@ dependencies = [
  "sha1_smol",
  "sha2",
  "simple_logger",
- "smallvec",
  "sqlparser",
  "tera",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tokio-postgres",
  "tokio-util",
@@ -864,7 +859,7 @@ dependencies = [
  "datafusion-physical-expr",
  "futures",
  "hashbrown 0.12.1",
- "itertools",
+ "itertools 0.10.3",
  "lazy_static",
  "log",
  "num_cpus",
@@ -965,12 +960,6 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
 
-[[package]]
-name = "difference"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -983,10 +972,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "downcast"
-version = "0.10.0"
+name = "displaydoc"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb454f0228b18c7f4c3b0ebbee346ed9c52e7443b0999cd543ff3571205701d"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
 
 [[package]]
 name = "egg"
@@ -1006,7 +1000,7 @@ dependencies = [
  "smallvec",
  "symbol_table",
  "symbolic_expressions",
- "thiserror",
+ "thiserror 1.0.69",
  "vectorize",
 ]
 
@@ -1037,6 +1031,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "errno"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "fallible-iterator"
 version = "0.2.0"
@@ -1045,12 +1049,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
 [[package]]
 name = "fastrand"
-version = "1.7.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
-dependencies = [
- "instant",
-]
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "flatbuffers"
@@ -1060,7 +1061,7 @@ checksum = "86b428b715fdbdd1c364b84573b5fdc0f84f8e423661b9f398735278bc7f2b6a"
 dependencies = [
  "bitflags 1.3.2",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -1069,27 +1070,24 @@ version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crc32fast",
  "libc",
  "miniz_oxide",
 ]
 
-[[package]]
-name = "float-cmp"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -1099,12 +1097,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fragile"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9d758e60b45e8d749c89c1b389ad8aee550f86aa12e2b9298b546dda7a82ab1"
-
 [[package]]
 name = "futures"
 version = "0.3.23"
@@ -1219,9 +1211,23 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
+ "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1299,6 +1305,17 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -1467,14 +1484,143 @@ dependencies = [
  "cxx-build",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1536,7 +1682,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -1560,6 +1706,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -1662,9 +1817,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.170"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
 
 [[package]]
 name = "libm"
@@ -1687,6 +1842,18 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "litemap"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
+
 [[package]]
 name = "lock_api"
 version = "0.4.7"
@@ -1705,11 +1872,11 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "lru"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7"
+checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465"
 dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -1807,37 +1974,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "mockall"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cabea45a7fc0e37093f4f30a5e2b62602253f91791c057d5f0470c63260c3d"
-dependencies = [
- "cfg-if 0.1.10",
- "downcast",
- "fragile",
- "lazy_static",
- "mockall_derive",
- "predicates",
- "predicates-tree",
-]
-
-[[package]]
-name = "mockall_derive"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c461918bf7f59eefb1459252756bf2351a995d6bd510d0b2061bd86bcdabfa6"
-dependencies = [
- "cfg-if 0.1.10",
- "proc-macro2",
- "quote",
- "syn 1.0.90",
-]
-
 [[package]]
 name = "multiversion"
 version = "0.6.1"
@@ -1858,12 +1998,6 @@ dependencies = [
  "syn 1.0.90",
 ]
 
-[[package]]
-name = "normalize-line-endings"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
-
 [[package]]
 name = "num"
 version = "0.4.0"
@@ -2020,7 +2154,7 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
@@ -2084,7 +2218,7 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a"
 dependencies = [
- "thiserror",
+ "thiserror 1.0.69",
  "ucd-trie",
 ]
 
@@ -2132,7 +2266,7 @@ dependencies = [
  "chrono",
  "hex",
  "log",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
 ]
 
@@ -2323,35 +2457,6 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 
-[[package]]
-name = "predicates"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df"
-dependencies = [
- "difference",
- "float-cmp",
- "normalize-line-endings",
- "predicates-core",
- "regex",
-]
-
-[[package]]
-name = "predicates-core"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb"
-
-[[package]]
-name = "predicates-tree"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032"
-dependencies = [
- "predicates-core",
- "termtree",
-]
-
 [[package]]
 name = "pretty_assertions"
 version = "1.2.1"
@@ -2375,9 +2480,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.2"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -2385,34 +2490,39 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls",
- "thiserror",
+ "socket2 0.5.5",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.3"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom 0.2.14",
  "rand",
  "ring",
  "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror",
+ "thiserror 2.0.11",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.2"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46"
+checksum = "e46f3055866785f6b92bc6164b76be02ca8f2eb4b002c0354b28cf4c119e5944"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2 0.5.5",
@@ -2456,7 +2566,7 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.14",
 ]
 
 [[package]]
@@ -2515,15 +2625,6 @@ version = "0.6.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
 
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.12.5"
@@ -2578,7 +2679,7 @@ dependencies = [
  "http",
  "reqwest",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "tower-service",
 ]
 
@@ -2589,8 +2690,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
- "cfg-if 1.0.0",
- "getrandom",
+ "cfg-if",
+ "getrandom 0.2.14",
  "libc",
  "spin",
  "untrusted",
@@ -2620,9 +2721,22 @@ checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
 
 [[package]]
 name = "rustc-hash"
-version = "1.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
+[[package]]
+name = "rustix"
+version = "0.38.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+dependencies = [
+ "bitflags 2.4.1",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
 
 [[package]]
 name = "rustls"
@@ -2653,6 +2767,9 @@ name = "rustls-pki-types"
 version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
@@ -2773,7 +2890,7 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "006769ba83e921b3085caa8334186b00cf92b4cb1a6cf4632fbccc8eff5c7549"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest",
 ]
@@ -2790,7 +2907,7 @@ version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest",
 ]
@@ -2881,6 +2998,12 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -2986,18 +3109,29 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "tempfile"
-version = "3.3.0"
+version = "3.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
+ "getrandom 0.3.1",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3035,12 +3169,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "termtree"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b"
-
 [[package]]
 name = "textwrap"
 version = "0.15.1"
@@ -3049,18 +3177,38 @@ checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+dependencies = [
+ "thiserror-impl 2.0.11",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "thiserror-impl",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3098,6 +3246,16 @@ dependencies = [
  "threadpool",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinytemplate"
 version = "1.2.1"
@@ -3405,22 +3563,34 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
 ]
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "uuid"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.14",
 ]
 
 [[package]]
@@ -3429,7 +3599,7 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.14",
  "serde",
 ]
 
@@ -3475,13 +3645,22 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "wasm-bindgen-macro",
 ]
 
@@ -3506,7 +3685,7 @@ version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -3551,6 +3730,16 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.26.3"
@@ -3788,7 +3977,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "windows-sys 0.48.0",
 ]
 
@@ -3816,6 +4005,27 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.4.1",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "yaml-rust"
 version = "0.4.5"
@@ -3825,6 +4035,30 @@ dependencies = [
  "linked-hash-map",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.32"
@@ -3845,12 +4079,55 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "zstd"
 version = "0.11.1+zstd.1.5.2"
diff --git a/rust/cubesql/cubeclient/.openapi-generator/FILES b/rust/cubesql/cubeclient/.openapi-generator/FILES
index 2ac921858b..a499650e84 100644
--- a/rust/cubesql/cubeclient/.openapi-generator/FILES
+++ b/rust/cubesql/cubeclient/.openapi-generator/FILES
@@ -5,6 +5,7 @@ src/models/v1_cube_meta.rs
 src/models/v1_cube_meta_dimension.rs
 src/models/v1_cube_meta_dimension_granularity.rs
 src/models/v1_cube_meta_folder.rs
+src/models/v1_cube_meta_hierarchy.rs
 src/models/v1_cube_meta_join.rs
 src/models/v1_cube_meta_measure.rs
 src/models/v1_cube_meta_segment.rs
diff --git a/rust/cubesql/cubeclient/src/models/mod.rs b/rust/cubesql/cubeclient/src/models/mod.rs
index 361e96528d..cb678c3516 100644
--- a/rust/cubesql/cubeclient/src/models/mod.rs
+++ b/rust/cubesql/cubeclient/src/models/mod.rs
@@ -6,6 +6,8 @@ pub mod v1_cube_meta_dimension_granularity;
 pub use self::v1_cube_meta_dimension_granularity::V1CubeMetaDimensionGranularity;
 pub mod v1_cube_meta_folder;
 pub use self::v1_cube_meta_folder::V1CubeMetaFolder;
+pub mod v1_cube_meta_hierarchy;
+pub use self::v1_cube_meta_hierarchy::V1CubeMetaHierarchy;
 pub mod v1_cube_meta_join;
 pub use self::v1_cube_meta_join::V1CubeMetaJoin;
 pub mod v1_cube_meta_measure;
diff --git a/rust/cubesql/cubeclient/src/models/v1_cube_meta.rs b/rust/cubesql/cubeclient/src/models/v1_cube_meta.rs
index cc81b7aa7c..e47c9349af 100644
--- a/rust/cubesql/cubeclient/src/models/v1_cube_meta.rs
+++ b/rust/cubesql/cubeclient/src/models/v1_cube_meta.rs
@@ -30,6 +30,8 @@ pub struct V1CubeMeta {
     pub joins: Option<Vec<crate::models::V1CubeMetaJoin>>,
     #[serde(rename = "folders", skip_serializing_if = "Option::is_none")]
     pub folders: Option<Vec<crate::models::V1CubeMetaFolder>>,
+    #[serde(rename = "hierarchies", skip_serializing_if = "Option::is_none")]
+    pub hierarchies: Option<Vec<crate::models::V1CubeMetaHierarchy>>,
 }
 
 impl V1CubeMeta {
@@ -51,6 +53,7 @@ impl V1CubeMeta {
             segments,
             joins: None,
             folders: None,
+            hierarchies: None,
         }
     }
 }
diff --git a/rust/cubesql/cubeclient/src/models/v1_cube_meta_dimension.rs b/rust/cubesql/cubeclient/src/models/v1_cube_meta_dimension.rs
index 3b4ab102c5..e13cc186c9 100644
--- a/rust/cubesql/cubeclient/src/models/v1_cube_meta_dimension.rs
+++ b/rust/cubesql/cubeclient/src/models/v1_cube_meta_dimension.rs
@@ -14,6 +14,8 @@ pub struct V1CubeMetaDimension {
     pub name: String,
     #[serde(rename = "title", skip_serializing_if = "Option::is_none")]
     pub title: Option<String>,
+    #[serde(rename = "shortTitle", skip_serializing_if = "Option::is_none")]
+    pub short_title: Option<String>,
     #[serde(rename = "description", skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,
     #[serde(rename = "type")]
@@ -32,6 +34,7 @@ impl V1CubeMetaDimension {
         V1CubeMetaDimension {
             name,
             title: None,
+            short_title: None,
             description: None,
             r#type,
             alias_member: None,
diff --git a/rust/cubesql/cubeclient/src/models/v1_cube_meta_hierarchy.rs b/rust/cubesql/cubeclient/src/models/v1_cube_meta_hierarchy.rs
new file mode 100644
index 0000000000..167d094579
--- /dev/null
+++ b/rust/cubesql/cubeclient/src/models/v1_cube_meta_hierarchy.rs
@@ -0,0 +1,29 @@
+/*
+ * Cube.js
+ *
+ * Cube.js Swagger Schema
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ * Generated by: https://openapi-generator.tech
+ */
+
+#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
+pub struct V1CubeMetaHierarchy {
+    #[serde(rename = "name")]
+    pub name: String,
+    #[serde(rename = "title", skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
+    #[serde(rename = "levels")]
+    pub levels: Vec<String>,
+}
+
+impl V1CubeMetaHierarchy {
+    pub fn new(name: String, levels: Vec<String>) -> V1CubeMetaHierarchy {
+        V1CubeMetaHierarchy {
+            name,
+            title: None,
+            levels,
+        }
+    }
+}
diff --git a/rust/cubesql/cubeclient/src/models/v1_cube_meta_measure.rs b/rust/cubesql/cubeclient/src/models/v1_cube_meta_measure.rs
index b05992a289..9acab8ddc2 100644
--- a/rust/cubesql/cubeclient/src/models/v1_cube_meta_measure.rs
+++ b/rust/cubesql/cubeclient/src/models/v1_cube_meta_measure.rs
@@ -14,6 +14,8 @@ pub struct V1CubeMetaMeasure {
     pub name: String,
     #[serde(rename = "title", skip_serializing_if = "Option::is_none")]
     pub title: Option<String>,
+    #[serde(rename = "shortTitle", skip_serializing_if = "Option::is_none")]
+    pub short_title: Option<String>,
     #[serde(rename = "description", skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,
     #[serde(rename = "type")]
@@ -29,6 +31,7 @@ impl V1CubeMetaMeasure {
         V1CubeMetaMeasure {
             name,
             title: None,
+            short_title: None,
             description: None,
             r#type,
             agg_type: None,
diff --git a/rust/cubesql/cubeclient/src/models/v1_cube_meta_type.rs b/rust/cubesql/cubeclient/src/models/v1_cube_meta_type.rs
index 94cdb84e03..63662f481a 100644
--- a/rust/cubesql/cubeclient/src/models/v1_cube_meta_type.rs
+++ b/rust/cubesql/cubeclient/src/models/v1_cube_meta_type.rs
@@ -9,7 +9,6 @@
  */
 
 /// V1CubeMetaType : Type of cube
-
 /// Type of cube
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
 pub enum V1CubeMetaType {
diff --git a/rust/cubesql/cubesql/Cargo.toml b/rust/cubesql/cubesql/Cargo.toml
index e6372fc473..053a2e00ba 100644
--- a/rust/cubesql/cubesql/Cargo.toml
+++ b/rust/cubesql/cubesql/Cargo.toml
@@ -10,25 +10,25 @@ homepage = "https://cube.dev"
 
 [dependencies]
 arc-swap = "1"
-datafusion = { git = 'https://github.com/cube-js/arrow-datafusion.git', rev = "dcf3e4aa26fd112043ef26fa4a78db5dbd443c86", default-features = false, features = ["regex_expressions", "unicode_expressions"] }
-anyhow = "1.0"
-thiserror = "1.0.50"
+datafusion = { git = 'https://github.com/cube-js/arrow-datafusion.git', rev = "dcf3e4aa26fd112043ef26fa4a78db5dbd443c86", default-features = false, features = [
+    "regex_expressions",
+    "unicode_expressions",
+] }
+thiserror = "2"
 cubeclient = { path = "../cubeclient" }
 pg-srv = { path = "../pg-srv" }
 sqlparser = { git = 'https://github.com/cube-js/sqlparser-rs.git', rev = "6a54d27d3b75a04b9f9cbe309a83078aa54b32fd" }
 base64 = "0.13.0"
 tokio = { version = "^1.35", features = ["full", "rt", "tracing"] }
 serde = { version = "^1.0", features = ["derive"] }
-itertools = "0.10.2"
+itertools = "0.14.0"
 serde_json = "^1.0"
 bytes = "1.2"
 futures = "0.3.23"
 rand = "0.8.3"
 hashbrown = "0.14.3"
-smallvec = "1.7.0"
-byteorder = "1.3.4"
 log = "0.4.21"
-rust_decimal = { version = "1.25", features = ["c-repr", "db-postgres"]}
+rust_decimal = { version = "1.25", features = ["c-repr", "db-postgres"] }
 postgres-types = "0.2.3"
 # Locked, because starting from 1.15 this crate switch from chrono to time
 # which panic with Could not determine the UTC offset on this system.
@@ -39,15 +39,15 @@ async-trait = "0.1.36"
 regex = "1.5"
 uuid = { version = "1", features = ["serde", "v4"] }
 bincode = "1.3.1"
-chrono = "0.4.31"
+chrono = "0.4.39"
 chrono-tz = "0.6"
-mockall = "0.8.1"
-tokio-util = { version = "0.7", features=["compat"] }
+tokio-util = { version = "0.7", features = ["compat"] }
 comfy-table = "7.1.0"
 bitflags = "1.3.2"
-egg = { rev = "952f8c2a1033e5da097d23c523b0d8e392eb532b", git = "https://github.com/cube-js/egg.git", features = ["serde-1"] }
+egg = { rev = "952f8c2a1033e5da097d23c523b0d8e392eb532b", git = "https://github.com/cube-js/egg.git", features = [
+    "serde-1",
+] }
 paste = "1.0.6"
-csv = "1.1.6"
 tracing = { version = "0.1.40", features = ["async-await"] }
 async-stream = "0.3.3"
 futures-core = "0.3.23"
@@ -55,7 +55,7 @@ futures-util = "0.3.23"
 sha1_smol = "1.0.0"
 tera = { version = "1", default-features = false }
 minijinja = { version = "1", features = ["json", "loader"] }
-lru = "0.12.1"
+lru = "0.13.0"
 sha2 = "0.10.8"
 bigdecimal = "0.4.2"
 indexmap = "1.9.3"
@@ -65,7 +65,10 @@ indexmap = "1.9.3"
 pretty_assertions = "1.0.0"
 insta = "1.12"
 portpicker = "0.1.1"
-tokio-postgres = { version = "0.7.7", features = ["with-chrono-0_4", "runtime"] }
+tokio-postgres = { version = "0.7.7", features = [
+    "with-chrono-0_4",
+    "runtime",
+] }
 rust_decimal = { version = "1.23", features = ["db-tokio-postgres"] }
 pg_interval = "0.4.1"
 criterion = { version = "0.4.0", features = ["html_reports"] }
@@ -90,25 +93,15 @@ harness = false
 # Feel free to remove any rule from here and fix all warnings with it
 # Or to write a comment why rule should stay disabled
 [lints.clippy]
-clone_on_copy = "allow"
 collapsible_if = "allow"
 collapsible_match = "allow"
 collapsible_else_if = "allow"
 comparison_chain = "allow"
 derive_ord_xor_partial_ord = "allow"
 field_reassign_with_default = "allow"
-if_same_then_else = "allow"
-into_iter_on_ref = "allow"
-iter_cloned_collect = "allow"
-iter_next_slice = "allow"
 len_without_is_empty = "allow"
 len_zero = "allow"
 let_and_return = "allow"
-manual_flatten = "allow"
-manual_range_contains = "allow"
-map_clone = "allow"
-map_flatten = "allow"
-map_identity = "allow"
 match_like_matches_macro = "allow"
 match_ref_pats = "allow"
 match_single_binding = "allow"
@@ -126,7 +119,6 @@ new_without_default = "allow"
 non_canonical_partial_ord_impl = "allow"
 nonminimal_bool = "allow"
 only_used_in_recursion = "allow"
-op_ref = "allow"
 option_as_ref_deref = "allow"
 partialeq_ne_impl = "allow"
 ptr_arg = "allow"
@@ -146,8 +138,5 @@ unnecessary_mut_passed = "allow"
 unnecessary_to_owned = "allow"
 unnecessary_unwrap = "allow"
 unused_unit = "allow"
-unwrap_or_default = "allow"
-useless_conversion = "allow"
 useless_format = "allow"
-useless_vec = "allow"
 wrong_self_convention = "allow"
diff --git a/rust/cubesql/cubesql/benches/large_model.rs b/rust/cubesql/cubesql/benches/large_model.rs
index 5565a266ae..ffbab70781 100644
--- a/rust/cubesql/cubesql/benches/large_model.rs
+++ b/rust/cubesql/cubesql/benches/large_model.rs
@@ -77,6 +77,7 @@ pub fn get_large_model_test_meta(dims: usize) -> Vec<V1CubeMeta> {
             V1CubeMetaMeasure {
                 name: format!("{}.count", cube_name),
                 title: None,
+                short_title: None,
                 description: None,
                 r#type: "number".to_string(),
                 agg_type: Some("count".to_string()),
@@ -85,6 +86,7 @@ pub fn get_large_model_test_meta(dims: usize) -> Vec<V1CubeMeta> {
             V1CubeMetaMeasure {
                 name: format!("{}.sum", cube_name),
                 title: None,
+                short_title: None,
                 description: None,
                 r#type: "number".to_string(),
                 agg_type: Some("sum".to_string()),
@@ -101,6 +103,7 @@ pub fn get_large_model_test_meta(dims: usize) -> Vec<V1CubeMeta> {
         segments: vec![],
         joins: None,
         folders: None,
+        hierarchies: None,
         meta: None,
     }]
 }
diff --git a/rust/cubesql/cubesql/e2e/tests/postgres.rs b/rust/cubesql/cubesql/e2e/tests/postgres.rs
index 472ad783fc..c549b1065a 100644
--- a/rust/cubesql/cubesql/e2e/tests/postgres.rs
+++ b/rust/cubesql/cubesql/e2e/tests/postgres.rs
@@ -109,7 +109,7 @@ impl PostgresIntegrationTestSuite {
         client
     }
 
-    async fn print_query_result<'a>(
+    async fn print_query_result(
         &self,
         res: Vec<Row>,
         with_description: bool,
@@ -134,7 +134,7 @@ impl PostgresIntegrationTestSuite {
         for row in res.into_iter() {
             let mut values: Vec<String> = Vec::new();
 
-            for (idx, column) in row.columns().into_iter().enumerate() {
+            for (idx, column) in row.columns().iter().enumerate() {
                 if !description_done {
                     description.push(format!(
                         "{} type: {} ({})",
@@ -1272,7 +1272,7 @@ impl AsyncTestSuite for PostgresIntegrationTestSuite {
                 let columns = rows.first().unwrap().columns();
                 assert_eq!(
                     columns
-                        .into_iter()
+                        .iter()
                         .map(|col| col.type_().oid())
                         .collect::<Vec<u32>>(),
                     vec![1184, 1114]
diff --git a/rust/cubesql/cubesql/e2e/tests/utils.rs b/rust/cubesql/cubesql/e2e/tests/utils.rs
index c566e59cab..980d16e9da 100644
--- a/rust/cubesql/cubesql/e2e/tests/utils.rs
+++ b/rust/cubesql/cubesql/e2e/tests/utils.rs
@@ -21,7 +21,7 @@ pub fn escape_snapshot_name(name: String) -> String {
 
     // Windows limit
     if name.len() > 200 {
-        name.chars().into_iter().take(200).collect()
+        name.chars().take(200).collect()
     } else {
         name
     }
diff --git a/rust/cubesql/cubesql/src/compile/engine/context.rs b/rust/cubesql/cubesql/src/compile/engine/context.rs
index 7900c64034..ce60928aec 100644
--- a/rust/cubesql/cubesql/src/compile/engine/context.rs
+++ b/rust/cubesql/cubesql/src/compile/engine/context.rs
@@ -140,7 +140,7 @@ impl TableProvider for CubeTableProvider {
                             ColumnType::Decimal(p, s) => DataType::Decimal(p, s),
                             ColumnType::List(field) => DataType::List(field.clone()),
                             ColumnType::Timestamp => {
-                                DataType::Timestamp(TimeUnit::Millisecond, None)
+                                DataType::Timestamp(TimeUnit::Nanosecond, None)
                             }
                         },
                         true,
diff --git a/rust/cubesql/cubesql/src/compile/engine/df/optimizers/filter_push_down.rs b/rust/cubesql/cubesql/src/compile/engine/df/optimizers/filter_push_down.rs
index 6a5b6cc606..c615fbc83f 100644
--- a/rust/cubesql/cubesql/src/compile/engine/df/optimizers/filter_push_down.rs
+++ b/rust/cubesql/cubesql/src/compile/engine/df/optimizers/filter_push_down.rs
@@ -120,7 +120,7 @@ fn filter_push_down(
             // let predicates = split_predicates(predicate)
             let predicates = vec![predicate.clone()]
                 .into_iter()
-                .chain(predicates.into_iter())
+                .chain(predicates)
                 .collect::<Vec<_>>();
             let mut pushable_predicates = vec![];
             let mut non_pushable_predicates = vec![];
@@ -326,10 +326,10 @@ fn filter_push_down(
                         optimizer_config,
                     )?),
                     on: on.clone(),
-                    join_type: join_type.clone(),
-                    join_constraint: join_constraint.clone(),
+                    join_type: *join_type,
+                    join_constraint: *join_constraint,
                     schema: schema.clone(),
-                    null_equals_null: null_equals_null.clone(),
+                    null_equals_null: *null_equals_null,
                 }),
             )
         }
@@ -483,8 +483,8 @@ fn filter_push_down(
             issue_filter(
                 predicates,
                 LogicalPlan::Limit(Limit {
-                    skip: skip.clone(),
-                    fetch: fetch.clone(),
+                    skip: *skip,
+                    fetch: *fetch,
                     input: Arc::new(filter_push_down(
                         optimizer,
                         input,
@@ -576,34 +576,32 @@ fn rewrite_map_for_projection(
         .collect()
 }
 
-/// Generates a rewrite map for union inputs, taking UNION's schema and one of the input's schema.
-/// These expressions can't be more complex than simple column references by definition.
-///
-/// TODO: see `LogicalPlan::Union` above
-/*
-fn rewrite_map_for_union_input(
-    union_schema: &DFSchema,
-    input_schema: &DFSchema,
-) -> HashMap<Column, Option<Expr>> {
-    union_schema
-        .fields()
-        .iter()
-        .zip(input_schema.fields().iter())
-        .flat_map(|(union_field, input_field)| {
-            vec![
-                (
-                    union_field.qualified_column(),
-                    Some(Expr::Column(input_field.unqualified_column())),
-                ),
-                (
-                    union_field.unqualified_column(),
-                    Some(Expr::Column(input_field.unqualified_column())),
-                ),
-            ]
-        })
-        .collect()
-}
-*/
+// /// Generates a rewrite map for union inputs, taking UNION's schema and one of the input's schema.
+// /// These expressions can't be more complex than simple column references by definition.
+// ///
+// /// TODO: see `LogicalPlan::Union` above
+// fn rewrite_map_for_union_input(
+//     union_schema: &DFSchema,
+//     input_schema: &DFSchema,
+// ) -> HashMap<Column, Option<Expr>> {
+//     union_schema
+//         .fields()
+//         .iter()
+//         .zip(input_schema.fields().iter())
+//         .flat_map(|(union_field, input_field)| {
+//             vec![
+//                 (
+//                     union_field.qualified_column(),
+//                     Some(Expr::Column(input_field.unqualified_column())),
+//                 ),
+//                 (
+//                     union_field.unqualified_column(),
+//                     Some(Expr::Column(input_field.unqualified_column())),
+//                 ),
+//             ]
+//         })
+//         .collect()
+// }
 
 /// Recursively concatenates several filter predicates into one binary AND expression.
 /// `predicates` must contain at least one expression.
@@ -621,24 +619,22 @@ fn concatenate_predicates(predicates: Vec<Expr>) -> Result<Expr> {
         ))
 }
 
-/// Recursively splits filter predicate from binary AND expressions into a flat vec of predicates.
-///
-/// TODO: see `LogicalPlan::Filter` above
-/*
-fn split_predicates(predicate: &Expr) -> Vec<Expr> {
-    match predicate {
-        Expr::BinaryExpr {
-            left,
-            op: Operator::And,
-            right,
-        } => split_predicates(left)
-            .into_iter()
-            .chain(split_predicates(right).into_iter())
-            .collect(),
-        expr => vec![expr.clone()],
-    }
-}
-*/
+// /// Recursively splits filter predicate from binary AND expressions into a flat vec of predicates.
+// ///
+// /// TODO: see `LogicalPlan::Filter` above
+// fn split_predicates(predicate: &Expr) -> Vec<Expr> {
+//     match predicate {
+//         Expr::BinaryExpr {
+//             left,
+//             op: Operator::And,
+//             right,
+//         } => split_predicates(left)
+//             .into_iter()
+//             .chain(split_predicates(right).into_iter())
+//             .collect(),
+//         expr => vec![expr.clone()],
+//     }
+// }
 
 /// Recursively checks if the passed expr is a filter predicate that can be pushed down.
 /// The predicate should be pushed down the plan if it can ultimately be pushed down to CubeScan.
@@ -984,12 +980,12 @@ mod tests {
     #[test]
     fn test_filter_down_cross_join_right_one_row() -> Result<()> {
         let plan = LogicalPlanBuilder::from(
-            LogicalPlanBuilder::from(make_sample_table("j1", vec!["c1"])?)
+            LogicalPlanBuilder::from(make_sample_table("j1", vec!["c1"], vec![])?)
                 .project(vec![col("c1")])?
                 .build()?,
         )
         .cross_join(
-            &LogicalPlanBuilder::from(make_sample_table("j2", vec!["c2"])?)
+            &LogicalPlanBuilder::from(make_sample_table("j2", vec!["c2"], vec![])?)
                 .project(vec![col("c2")])?
                 .aggregate(vec![] as Vec<Expr>, vec![count(lit(1u8))])?
                 .project_with_alias(
diff --git a/rust/cubesql/cubesql/src/compile/engine/df/optimizers/filter_split_meta.rs b/rust/cubesql/cubesql/src/compile/engine/df/optimizers/filter_split_meta.rs
new file mode 100644
index 0000000000..5d15d9e79d
--- /dev/null
+++ b/rust/cubesql/cubesql/src/compile/engine/df/optimizers/filter_split_meta.rs
@@ -0,0 +1,326 @@
+use std::sync::Arc;
+
+use datafusion::{
+    error::{DataFusionError, Result},
+    logical_plan::{
+        plan::{
+            Aggregate, CrossJoin, Distinct, Join, Limit, Projection, Repartition, Sort, Subquery,
+            Union, Window,
+        },
+        Column, Expr, Filter, LogicalPlan, Operator,
+    },
+    optimizer::optimizer::{OptimizerConfig, OptimizerRule},
+    physical_plan::functions::BuiltinScalarFunction,
+};
+
+/// Filter Split Meta optimizer rule splits a `WHERE` clause into two distinct filters,
+/// pushing meta filters (currently only `__user`) down the plan, separate from other filters.
+/// This helps with SQL push down, as otherwise `CubeScan` would not contain `ChangeUserMember`
+/// since filters would contain replacers.
+#[derive(Default)]
+pub struct FilterSplitMeta {}
+
+impl FilterSplitMeta {
+    #[allow(missing_docs)]
+    pub fn new() -> Self {
+        Self {}
+    }
+}
+
+impl OptimizerRule for FilterSplitMeta {
+    fn optimize(
+        &self,
+        plan: &LogicalPlan,
+        optimizer_config: &OptimizerConfig,
+    ) -> Result<LogicalPlan> {
+        filter_split_meta(self, plan, optimizer_config)
+    }
+
+    fn name(&self) -> &str {
+        "__cube__filter_split_meta"
+    }
+}
+
+/// Recursively optimizes plan, searching for filters that can be split.
+/// Continues optimizing down the plan after splitting.
+fn filter_split_meta(
+    optimizer: &FilterSplitMeta,
+    plan: &LogicalPlan,
+    optimizer_config: &OptimizerConfig,
+) -> Result<LogicalPlan> {
+    match plan {
+        LogicalPlan::Projection(Projection {
+            expr,
+            input,
+            schema,
+            alias,
+        }) => Ok(LogicalPlan::Projection(Projection {
+            expr: expr.clone(),
+            input: Arc::new(filter_split_meta(optimizer, input, optimizer_config)?),
+            schema: schema.clone(),
+            alias: alias.clone(),
+        })),
+        LogicalPlan::Filter(Filter { predicate, input }) => {
+            // Filter expressions can be moved around or split when they're chained with `AND` safely.
+            // However, the input of `Filter` might be realiased, so we can't be sure if `__user` is really
+            // for the original meta column; it makes sense to apply this only if input is `TableScan`.
+            // However, we also have joins complicating things.
+            // Additionally, there's no harm in splitting `__user` filter from other filters anyway;
+            // hence we'll split all `Filter` nodes.
+            let (normal_predicates, meta_predicates) = split_predicates(predicate, vec![], vec![]);
+            let mut plan = filter_split_meta(optimizer, input, optimizer_config)?;
+            if !meta_predicates.is_empty() {
+                plan = LogicalPlan::Filter(Filter {
+                    predicate: collect_predicates(meta_predicates)?,
+                    input: Arc::new(plan),
+                });
+            }
+            if !normal_predicates.is_empty() {
+                plan = LogicalPlan::Filter(Filter {
+                    predicate: collect_predicates(normal_predicates)?,
+                    input: Arc::new(plan),
+                });
+            }
+            Ok(plan)
+        }
+        LogicalPlan::Window(Window {
+            input,
+            window_expr,
+            schema,
+        }) => Ok(LogicalPlan::Window(Window {
+            input: Arc::new(filter_split_meta(optimizer, input, optimizer_config)?),
+            window_expr: window_expr.clone(),
+            schema: schema.clone(),
+        })),
+        LogicalPlan::Aggregate(Aggregate {
+            input,
+            group_expr,
+            aggr_expr,
+            schema,
+        }) => Ok(LogicalPlan::Aggregate(Aggregate {
+            input: Arc::new(filter_split_meta(optimizer, input, optimizer_config)?),
+            group_expr: group_expr.clone(),
+            aggr_expr: aggr_expr.clone(),
+            schema: schema.clone(),
+        })),
+        LogicalPlan::Sort(Sort { expr, input }) => Ok(LogicalPlan::Sort(Sort {
+            expr: expr.clone(),
+            input: Arc::new(filter_split_meta(optimizer, input, optimizer_config)?),
+        })),
+        LogicalPlan::Join(Join {
+            left,
+            right,
+            on,
+            join_type,
+            join_constraint,
+            schema,
+            null_equals_null,
+        }) => Ok(LogicalPlan::Join(Join {
+            left: Arc::new(filter_split_meta(optimizer, left, optimizer_config)?),
+            right: Arc::new(filter_split_meta(optimizer, right, optimizer_config)?),
+            on: on.clone(),
+            join_type: *join_type,
+            join_constraint: *join_constraint,
+            schema: schema.clone(),
+            null_equals_null: *null_equals_null,
+        })),
+        LogicalPlan::CrossJoin(CrossJoin {
+            left,
+            right,
+            schema,
+        }) => Ok(LogicalPlan::CrossJoin(CrossJoin {
+            left: Arc::new(filter_split_meta(optimizer, left, optimizer_config)?),
+            right: Arc::new(filter_split_meta(optimizer, right, optimizer_config)?),
+            schema: schema.clone(),
+        })),
+        LogicalPlan::Repartition(Repartition {
+            input,
+            partitioning_scheme,
+        }) => Ok(LogicalPlan::Repartition(Repartition {
+            input: Arc::new(filter_split_meta(optimizer, input, optimizer_config)?),
+            partitioning_scheme: partitioning_scheme.clone(),
+        })),
+        LogicalPlan::Union(Union {
+            inputs,
+            schema,
+            alias,
+        }) => Ok(LogicalPlan::Union(Union {
+            inputs: inputs
+                .iter()
+                .map(|plan| filter_split_meta(optimizer, plan, optimizer_config))
+                .collect::<Result<_>>()?,
+            schema: schema.clone(),
+            alias: alias.clone(),
+        })),
+        plan @ LogicalPlan::TableScan(_) | plan @ LogicalPlan::EmptyRelation(_) => {
+            // `TableScan` and `EmptyRelation` are as far as we can optimize.
+            Ok(plan.clone())
+        }
+        LogicalPlan::Limit(Limit { skip, fetch, input }) => Ok(LogicalPlan::Limit(Limit {
+            skip: *skip,
+            fetch: *fetch,
+            input: Arc::new(filter_split_meta(optimizer, input, optimizer_config)?),
+        })),
+        LogicalPlan::Subquery(Subquery {
+            subqueries,
+            input,
+            schema,
+            types,
+        }) => Ok(LogicalPlan::Subquery(Subquery {
+            subqueries: subqueries
+                .iter()
+                .map(|subquery| filter_split_meta(optimizer, subquery, optimizer_config))
+                .collect::<Result<_>>()?,
+            input: Arc::new(filter_split_meta(optimizer, input, optimizer_config)?),
+            schema: schema.clone(),
+            types: types.clone(),
+        })),
+        LogicalPlan::Distinct(Distinct { input }) => Ok(LogicalPlan::Distinct(Distinct {
+            input: Arc::new(filter_split_meta(optimizer, input, optimizer_config)?),
+        })),
+        other => {
+            // The rest of the plans have no inputs to optimize, or it makes no sense
+            // to optimize them.
+            Ok(other.clone())
+        }
+    }
+}
+
+/// Splits the provided predicate into two vectors: one for normal predicates and one for meta predicates.
+/// These will later be concatenated into a single `Filter` node each.
+fn split_predicates(
+    predicate: &Expr,
+    mut normal_predicates: Vec<Expr>,
+    mut meta_predicates: Vec<Expr>,
+) -> (Vec<Expr>, Vec<Expr>) {
+    if let Expr::BinaryExpr { left, op, right } = predicate {
+        if *op == Operator::And {
+            let (normal_predicates, meta_predicates) =
+                split_predicates(left, normal_predicates, meta_predicates);
+            let (normal_predicates, meta_predicates) =
+                split_predicates(right, normal_predicates, meta_predicates);
+            return (normal_predicates, meta_predicates);
+        }
+    }
+
+    if is_meta_predicate(predicate) {
+        meta_predicates.push(predicate.clone());
+    } else {
+        normal_predicates.push(predicate.clone());
+    }
+    (normal_predicates, meta_predicates)
+}
+
+/// Determines if the provided expression is a meta predicate.
+/// Supported variants:
+/// - `BinaryExpr` with `Eq`, `Like`, or `ILike` operators and one of the sides being a meta column;
+/// - `Like` or `ILike` with expr or pattern being a meta column;
+/// - `IsNotNull` over a meta column (or `Not` over `IsNull` over a meta column);
+/// - `InList` with one value in list and expr or list value being a meta column.
+fn is_meta_predicate(predicate: &Expr) -> bool {
+    match predicate {
+        Expr::BinaryExpr { left, op, right } => {
+            if matches!(op, Operator::Eq | Operator::Like | Operator::ILike) {
+                return is_meta_column(left) || is_meta_column(right);
+            }
+            false
+        }
+        Expr::Like(like) | Expr::ILike(like) => {
+            is_meta_column(&like.expr) || is_meta_column(&like.pattern)
+        }
+        Expr::IsNotNull(expr) => is_meta_column(expr),
+        Expr::Not(expr) => match expr.as_ref() {
+            Expr::IsNull(expr) => is_meta_column(expr),
+            _ => false,
+        },
+        Expr::InList {
+            expr,
+            list,
+            negated: false,
+        } => {
+            if list.len() != 1 {
+                return false;
+            }
+            is_meta_column(expr) || is_meta_column(&list[0])
+        }
+        _ => false,
+    }
+}
+
+/// Determines if the provided expression is meta column reference.
+/// Currently, only `__user` is considered a meta column.
+/// Additionally, `Lower` function over a meta column is also considered a meta column.
+fn is_meta_column(expr: &Expr) -> bool {
+    match expr {
+        Expr::Column(Column { name, .. }) => name.eq_ignore_ascii_case("__user"),
+        Expr::ScalarFunction { fun, args } => {
+            if matches!(fun, BuiltinScalarFunction::Lower) && args.len() == 1 {
+                return is_meta_column(&args[0]);
+            }
+            false
+        }
+        _ => false,
+    }
+}
+
+/// Concatenates the provided predicates into a single expression using `AND` operator.
+fn collect_predicates(predicates: Vec<Expr>) -> Result<Expr> {
+    predicates
+        .into_iter()
+        .reduce(|last, next| Expr::BinaryExpr {
+            left: Box::new(last),
+            op: Operator::And,
+            right: Box::new(next),
+        })
+        .ok_or_else(|| {
+            DataFusionError::Internal(
+                "Unable to optimize plan: can't concatenate predicates, vec is unexpectedly empty"
+                    .to_string(),
+            )
+        })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{super::utils::make_sample_table, *};
+    use datafusion::logical_plan::{col, lit, LogicalPlanBuilder};
+
+    fn optimize(plan: &LogicalPlan) -> Result<LogicalPlan> {
+        let rule = FilterSplitMeta::new();
+        rule.optimize(plan, &OptimizerConfig::new())
+    }
+
+    fn assert_optimized_plan_eq(plan: LogicalPlan, expected: &str) {
+        let optimized_plan = optimize(&plan).expect("failed to optimize plan");
+        let formatted_plan = format!("{:?}", optimized_plan);
+        assert_eq!(formatted_plan, expected);
+    }
+
+    #[test]
+    fn test_filter_split_meta() -> Result<()> {
+        let plan = LogicalPlanBuilder::from(make_sample_table(
+            "t1",
+            vec!["c1", "c2", "c3"],
+            vec!["__user"],
+        )?)
+        .filter(
+            col("c1")
+                .gt(lit(10i32))
+                .and(col("__user").eq(lit("postgres".to_string())))
+                .and(col("c2").lt(lit(5i32)))
+                .and(col("__user").is_not_null()),
+        )?
+        .project(vec![col("c1"), col("c2"), col("c3")])?
+        .build()?;
+
+        let expected = "\
+              Projection: #t1.c1, #t1.c2, #t1.c3\
+            \n  Filter: #t1.c1 > Int32(10) AND #t1.c2 < Int32(5)\
+            \n    Filter: #t1.__user = Utf8(\"postgres\") AND #t1.__user IS NOT NULL\
+            \n      TableScan: t1 projection=None\
+        ";
+
+        assert_optimized_plan_eq(plan, expected);
+        Ok(())
+    }
+}
diff --git a/rust/cubesql/cubesql/src/compile/engine/df/optimizers/limit_push_down.rs b/rust/cubesql/cubesql/src/compile/engine/df/optimizers/limit_push_down.rs
index f25d66cda0..03072ef8a9 100644
--- a/rust/cubesql/cubesql/src/compile/engine/df/optimizers/limit_push_down.rs
+++ b/rust/cubesql/cubesql/src/compile/engine/df/optimizers/limit_push_down.rs
@@ -203,10 +203,10 @@ fn limit_push_down(
                         optimizer_config,
                     )?),
                     on: on.clone(),
-                    join_type: join_type.clone(),
-                    join_constraint: join_constraint.clone(),
+                    join_type: *join_type,
+                    join_constraint: *join_constraint,
                     schema: schema.clone(),
-                    null_equals_null: null_equals_null.clone(),
+                    null_equals_null: *null_equals_null,
                 }),
             )
         }
@@ -449,12 +449,12 @@ mod tests {
     #[test]
     fn test_limit_down_cross_join_right_one_row() -> Result<()> {
         let plan = LogicalPlanBuilder::from(
-            LogicalPlanBuilder::from(make_sample_table("j1", vec!["c1"])?)
+            LogicalPlanBuilder::from(make_sample_table("j1", vec!["c1"], vec![])?)
                 .project(vec![col("c1")])?
                 .build()?,
         )
         .cross_join(
-            &LogicalPlanBuilder::from(make_sample_table("j2", vec!["c2"])?)
+            &LogicalPlanBuilder::from(make_sample_table("j2", vec!["c2"], vec![])?)
                 .project(vec![col("c2")])?
                 .aggregate(vec![] as Vec<Expr>, vec![count(lit(1u8))])?
                 .project_with_alias(
diff --git a/rust/cubesql/cubesql/src/compile/engine/df/optimizers/mod.rs b/rust/cubesql/cubesql/src/compile/engine/df/optimizers/mod.rs
index b9a9b331f8..b25aca3d15 100644
--- a/rust/cubesql/cubesql/src/compile/engine/df/optimizers/mod.rs
+++ b/rust/cubesql/cubesql/src/compile/engine/df/optimizers/mod.rs
@@ -1,9 +1,11 @@
 pub mod utils;
 
 mod filter_push_down;
+mod filter_split_meta;
 mod limit_push_down;
 mod sort_push_down;
 
 pub use filter_push_down::FilterPushDown;
+pub use filter_split_meta::FilterSplitMeta;
 pub use limit_push_down::LimitPushDown;
 pub use sort_push_down::SortPushDown;
diff --git a/rust/cubesql/cubesql/src/compile/engine/df/optimizers/sort_push_down.rs b/rust/cubesql/cubesql/src/compile/engine/df/optimizers/sort_push_down.rs
index e77cb44b13..040cf72a26 100644
--- a/rust/cubesql/cubesql/src/compile/engine/df/optimizers/sort_push_down.rs
+++ b/rust/cubesql/cubesql/src/compile/engine/df/optimizers/sort_push_down.rs
@@ -72,8 +72,8 @@ fn sort_push_down(
                             } => Ok(if is_column_expr(expr) {
                                 rewrite(expr, &rewrite_map)?.map(|expr| Expr::Sort {
                                     expr: Box::new(expr),
-                                    asc: asc.clone(),
-                                    nulls_first: nulls_first.clone(),
+                                    asc: *asc,
+                                    nulls_first: *nulls_first,
                                 })
                             } else {
                                 None
@@ -199,10 +199,10 @@ fn sort_push_down(
                         )?),
                         right: Arc::new(sort_push_down(optimizer, right, None, optimizer_config)?),
                         on: on.clone(),
-                        join_type: join_type.clone(),
-                        join_constraint: join_constraint.clone(),
+                        join_type: *join_type,
+                        join_constraint: *join_constraint,
                         schema: schema.clone(),
-                        null_equals_null: null_equals_null.clone(),
+                        null_equals_null: *null_equals_null,
                     }));
                 }
             }
@@ -213,10 +213,10 @@ fn sort_push_down(
                     left: Arc::new(sort_push_down(optimizer, left, None, optimizer_config)?),
                     right: Arc::new(sort_push_down(optimizer, right, None, optimizer_config)?),
                     on: on.clone(),
-                    join_type: join_type.clone(),
-                    join_constraint: join_constraint.clone(),
+                    join_type: *join_type,
+                    join_constraint: *join_constraint,
                     schema: schema.clone(),
-                    null_equals_null: null_equals_null.clone(),
+                    null_equals_null: *null_equals_null,
                 }),
             )
         }
@@ -285,8 +285,8 @@ fn sort_push_down(
             issue_sort(
                 sort_expr,
                 LogicalPlan::Limit(Limit {
-                    skip: skip.clone(),
-                    fetch: fetch.clone(),
+                    skip: *skip,
+                    fetch: *fetch,
                     input: Arc::new(sort_push_down(optimizer, input, None, optimizer_config)?),
                 }),
             )
@@ -503,12 +503,12 @@ mod tests {
     #[test]
     fn test_sort_down_join() -> Result<()> {
         let plan = LogicalPlanBuilder::from(
-            LogicalPlanBuilder::from(make_sample_table("j1", vec!["key", "c1"])?)
+            LogicalPlanBuilder::from(make_sample_table("j1", vec!["key", "c1"], vec![])?)
                 .project(vec![col("key"), col("c1")])?
                 .build()?,
         )
         .join(
-            &LogicalPlanBuilder::from(make_sample_table("j2", vec!["key", "c2"])?)
+            &LogicalPlanBuilder::from(make_sample_table("j2", vec!["key", "c2"], vec![])?)
                 .project(vec![col("key"), col("c2")])?
                 .build()?,
             JoinType::Inner,
@@ -534,12 +534,12 @@ mod tests {
         assert_optimized_plan_eq(plan, expected);
 
         let plan = LogicalPlanBuilder::from(
-            LogicalPlanBuilder::from(make_sample_table("j1", vec!["key", "c1"])?)
+            LogicalPlanBuilder::from(make_sample_table("j1", vec!["key", "c1"], vec![])?)
                 .project(vec![col("key"), col("c1")])?
                 .build()?,
         )
         .join(
-            &LogicalPlanBuilder::from(make_sample_table("j2", vec!["key", "c2"])?)
+            &LogicalPlanBuilder::from(make_sample_table("j2", vec!["key", "c2"], vec![])?)
                 .project(vec![col("key"), col("c2")])?
                 .build()?,
             JoinType::Inner,
@@ -570,12 +570,12 @@ mod tests {
     #[test]
     fn test_sort_down_cross_join() -> Result<()> {
         let plan = LogicalPlanBuilder::from(
-            LogicalPlanBuilder::from(make_sample_table("j1", vec!["key", "c1"])?)
+            LogicalPlanBuilder::from(make_sample_table("j1", vec!["key", "c1"], vec![])?)
                 .project(vec![col("key"), col("c1")])?
                 .build()?,
         )
         .cross_join(
-            &LogicalPlanBuilder::from(make_sample_table("j2", vec!["key", "c2"])?)
+            &LogicalPlanBuilder::from(make_sample_table("j2", vec!["key", "c2"], vec![])?)
                 .project(vec![col("key"), col("c2")])?
                 .build()?,
         )?
@@ -596,12 +596,12 @@ mod tests {
         assert_optimized_plan_eq(plan, expected);
 
         let plan = LogicalPlanBuilder::from(
-            LogicalPlanBuilder::from(make_sample_table("j1", vec!["key", "c1"])?)
+            LogicalPlanBuilder::from(make_sample_table("j1", vec!["key", "c1"], vec![])?)
                 .project(vec![col("key"), col("c1")])?
                 .build()?,
         )
         .cross_join(
-            &LogicalPlanBuilder::from(make_sample_table("j2", vec!["key", "c2"])?)
+            &LogicalPlanBuilder::from(make_sample_table("j2", vec!["key", "c2"], vec![])?)
                 .project(vec![col("key"), col("c2")])?
                 .build()?,
         )?
diff --git a/rust/cubesql/cubesql/src/compile/engine/df/optimizers/utils.rs b/rust/cubesql/cubesql/src/compile/engine/df/optimizers/utils.rs
index 459a7525b5..5dfd65995f 100644
--- a/rust/cubesql/cubesql/src/compile/engine/df/optimizers/utils.rs
+++ b/rust/cubesql/cubesql/src/compile/engine/df/optimizers/utils.rs
@@ -44,7 +44,7 @@ pub fn rewrite(expr: &Expr, map: &HashMap<Column, Option<Expr>>) -> Result<Optio
             };
             rewrites.map(|(left, right)| Expr::BinaryExpr {
                 left: Box::new(left),
-                op: op.clone(),
+                op: *op,
                 right: Box::new(right),
             })
         }
@@ -60,9 +60,9 @@ pub fn rewrite(expr: &Expr, map: &HashMap<Column, Option<Expr>>) -> Result<Optio
             };
             rewrites.map(|(left, right)| Expr::AnyExpr {
                 left: Box::new(left),
-                op: op.clone(),
+                op: *op,
                 right: Box::new(right),
-                all: all.clone(),
+                all: *all,
             })
         }
         Expr::Like(Like {
@@ -77,10 +77,10 @@ pub fn rewrite(expr: &Expr, map: &HashMap<Column, Option<Expr>>) -> Result<Optio
             };
             rewrites.map(|(expr, pattern)| {
                 Expr::Like(Like {
-                    negated: negated.clone(),
+                    negated: *negated,
                     expr: Box::new(expr),
                     pattern: Box::new(pattern),
-                    escape_char: escape_char.clone(),
+                    escape_char: *escape_char,
                 })
             })
         }
@@ -96,10 +96,10 @@ pub fn rewrite(expr: &Expr, map: &HashMap<Column, Option<Expr>>) -> Result<Optio
             };
             rewrites.map(|(expr, pattern)| {
                 Expr::ILike(Like {
-                    negated: negated.clone(),
+                    negated: *negated,
                     expr: Box::new(expr),
                     pattern: Box::new(pattern),
-                    escape_char: escape_char.clone(),
+                    escape_char: *escape_char,
                 })
             })
         }
@@ -115,10 +115,10 @@ pub fn rewrite(expr: &Expr, map: &HashMap<Column, Option<Expr>>) -> Result<Optio
             };
             rewrites.map(|(expr, pattern)| {
                 Expr::SimilarTo(Like {
-                    negated: negated.clone(),
+                    negated: *negated,
                     expr: Box::new(expr),
                     pattern: Box::new(pattern),
-                    escape_char: escape_char.clone(),
+                    escape_char: *escape_char,
                 })
             })
         }
@@ -148,7 +148,7 @@ pub fn rewrite(expr: &Expr, map: &HashMap<Column, Option<Expr>>) -> Result<Optio
             };
             rewrites.map(|(expr, low, high)| Expr::Between {
                 expr: Box::new(expr),
-                negated: negated.clone(),
+                negated: *negated,
                 low: Box::new(low),
                 high: Box::new(high),
             })
@@ -211,8 +211,8 @@ pub fn rewrite(expr: &Expr, map: &HashMap<Column, Option<Expr>>) -> Result<Optio
             nulls_first,
         } => rewrite(expr, map)?.map(|expr| Expr::Sort {
             expr: Box::new(expr),
-            asc: asc.clone(),
-            nulls_first: nulls_first.clone(),
+            asc: *asc,
+            nulls_first: *nulls_first,
         }),
         Expr::ScalarFunction { fun, args } => args
             .iter()
@@ -249,7 +249,7 @@ pub fn rewrite(expr: &Expr, map: &HashMap<Column, Option<Expr>>) -> Result<Optio
             .map(|args| Expr::AggregateFunction {
                 fun: fun.clone(),
                 args,
-                distinct: distinct.clone(),
+                distinct: *distinct,
             }),
         Expr::WindowFunction {
             fun,
@@ -283,7 +283,7 @@ pub fn rewrite(expr: &Expr, map: &HashMap<Column, Option<Expr>>) -> Result<Optio
                     args,
                     partition_by,
                     order_by,
-                    window_frame: window_frame.clone(),
+                    window_frame: *window_frame,
                 })
         }
         Expr::AggregateUDF { fun, args } => args
@@ -310,7 +310,7 @@ pub fn rewrite(expr: &Expr, map: &HashMap<Column, Option<Expr>>) -> Result<Optio
                 .map(|list| Expr::InList {
                     expr: Box::new(expr),
                     list,
-                    negated: negated.clone(),
+                    negated: *negated,
                 })
         }
         // As rewrites are used to push things down or up the plan, wildcards
@@ -329,7 +329,7 @@ pub fn rewrite(expr: &Expr, map: &HashMap<Column, Option<Expr>>) -> Result<Optio
             rewrites.map(|(expr, subquery)| Expr::InSubquery {
                 expr: Box::new(expr),
                 subquery: Box::new(subquery),
-                negated: negated.clone(),
+                negated: *negated,
             })
         }
     })
@@ -386,7 +386,7 @@ pub fn is_const_expr(expr: &Expr) -> bool {
             _ => false,
         },
         Expr::InList { expr, list, .. } => {
-            is_const_expr(expr) && list.iter().map(|item| is_const_expr(item)).all(|item| item)
+            is_const_expr(expr) && list.iter().all(|item| is_const_expr(item))
         }
         _ => false,
     }
@@ -415,25 +415,25 @@ pub fn get_expr_columns(expr: &Expr) -> Vec<Column> {
         Expr::BinaryExpr { left, right, .. } | Expr::AnyExpr { left, right, .. } => {
             get_expr_columns(left)
                 .into_iter()
-                .chain(get_expr_columns(right).into_iter())
+                .chain(get_expr_columns(right))
                 .collect()
         }
         Expr::Like(Like { expr, pattern, .. })
         | Expr::ILike(Like { expr, pattern, .. })
         | Expr::SimilarTo(Like { expr, pattern, .. }) => get_expr_columns(expr)
             .into_iter()
-            .chain(get_expr_columns(pattern).into_iter())
+            .chain(get_expr_columns(pattern))
             .collect(),
         Expr::GetIndexedField { expr, key } => get_expr_columns(expr)
             .into_iter()
-            .chain(get_expr_columns(key).into_iter())
+            .chain(get_expr_columns(key))
             .collect(),
         Expr::Between {
             expr, low, high, ..
         } => get_expr_columns(expr)
             .into_iter()
-            .chain(get_expr_columns(low).into_iter())
-            .chain(get_expr_columns(high).into_iter())
+            .chain(get_expr_columns(low))
+            .chain(get_expr_columns(high))
             .collect(),
         Expr::Case {
             expr,
@@ -447,15 +447,14 @@ pub fn get_expr_columns(expr: &Expr) -> Vec<Column> {
             .chain(when_then_expr.iter().flat_map(|(when, then)| {
                 get_expr_columns(when)
                     .into_iter()
-                    .chain(get_expr_columns(then).into_iter())
+                    .chain(get_expr_columns(then))
                     .collect::<Vec<_>>()
             }))
             .chain(
                 else_expr
                     .as_ref()
                     .map(|else_expr| get_expr_columns(else_expr))
-                    .unwrap_or(vec![])
-                    .into_iter(),
+                    .unwrap_or(vec![]),
             )
             .collect(),
         Expr::ScalarFunction { args, .. }
@@ -553,11 +552,20 @@ pub fn plan_has_projections(plan: &LogicalPlan) -> bool {
 }
 
 #[cfg(test)]
-pub fn make_sample_table(name: &str, fields: Vec<&str>) -> Result<LogicalPlan> {
+pub fn make_sample_table(
+    name: &str,
+    int_fields: Vec<&str>,
+    str_fields: Vec<&str>,
+) -> Result<LogicalPlan> {
     let schema = Schema::new(
-        fields
+        int_fields
             .into_iter()
             .map(|field| Field::new(field, DataType::Int32, true))
+            .chain(
+                str_fields
+                    .into_iter()
+                    .map(|field| Field::new(field, DataType::Utf8, true)),
+            )
             .collect(),
     );
     LogicalPlanBuilder::scan_empty(Some(name), &schema, None)?.build()
@@ -565,5 +573,5 @@ pub fn make_sample_table(name: &str, fields: Vec<&str>) -> Result<LogicalPlan> {
 
 #[cfg(test)]
 pub fn sample_table() -> Result<LogicalPlan> {
-    make_sample_table("t1", vec!["c1", "c2", "c3"])
+    make_sample_table("t1", vec!["c1", "c2", "c3"], vec![])
 }
diff --git a/rust/cubesql/cubesql/src/compile/engine/df/scan.rs b/rust/cubesql/cubesql/src/compile/engine/df/scan.rs
index afd410898b..38be5c0497 100644
--- a/rust/cubesql/cubesql/src/compile/engine/df/scan.rs
+++ b/rust/cubesql/cubesql/src/compile/engine/df/scan.rs
@@ -281,11 +281,7 @@ impl UserDefinedLogicalNode for WrappedSelectNode {
             .map(|i| Arc::new(inputs[i].clone()))
             .collect::<Vec<_>>();
         let mut joins_expr = vec![];
-        let join_types = self
-            .joins
-            .iter()
-            .map(|(_, _, t)| t.clone())
-            .collect::<Vec<_>>();
+        let join_types = self.joins.iter().map(|(_, _, t)| *t).collect::<Vec<_>>();
         let mut filter_expr = vec![];
         let mut having_expr = vec![];
         let mut order_expr = vec![];
@@ -332,7 +328,7 @@ impl UserDefinedLogicalNode for WrappedSelectNode {
 
         Arc::new(WrappedSelectNode::new(
             self.schema.clone(),
-            self.select_type.clone(),
+            self.select_type,
             projection_expr,
             self.subqueries.clone(),
             group_expr,
@@ -976,7 +972,7 @@ pub fn transform_response<V: ValueObject>(
                         },
                     },
                     {
-                        (ScalarValue::Int16(v), builder) => builder.append_option(v.clone())?,
+                        (ScalarValue::Int16(v), builder) => builder.append_option(*v)?,
                     }
                 )
             }
@@ -1001,7 +997,7 @@ pub fn transform_response<V: ValueObject>(
                         },
                     },
                     {
-                        (ScalarValue::Int32(v), builder) => builder.append_option(v.clone())?,
+                        (ScalarValue::Int32(v), builder) => builder.append_option(*v)?,
                     }
                 )
             }
@@ -1026,7 +1022,7 @@ pub fn transform_response<V: ValueObject>(
                         },
                     },
                     {
-                        (ScalarValue::Int64(v), builder) => builder.append_option(v.clone())?,
+                        (ScalarValue::Int64(v), builder) => builder.append_option(*v)?,
                     }
                 )
             }
@@ -1051,7 +1047,7 @@ pub fn transform_response<V: ValueObject>(
                         },
                     },
                     {
-                        (ScalarValue::Float32(v), builder) => builder.append_option(v.clone())?,
+                        (ScalarValue::Float32(v), builder) => builder.append_option(*v)?,
                     }
                 )
             }
@@ -1076,7 +1072,7 @@ pub fn transform_response<V: ValueObject>(
                         },
                     },
                     {
-                        (ScalarValue::Float64(v), builder) => builder.append_option(v.clone())?,
+                        (ScalarValue::Float64(v), builder) => builder.append_option(*v)?,
                     }
                 )
             }
@@ -1099,7 +1095,7 @@ pub fn transform_response<V: ValueObject>(
                         },
                     },
                     {
-                        (ScalarValue::Boolean(v), builder) => builder.append_option(v.clone())?,
+                        (ScalarValue::Boolean(v), builder) => builder.append_option(*v)?,
                     }
                 )
             }
@@ -1129,7 +1125,7 @@ pub fn transform_response<V: ValueObject>(
                             // TODO switch parsing to microseconds
                             if timestamp.and_utc().timestamp_millis() > (((1i64) << 62) / 1_000_000) {
                                 builder.append_null()?;
-                            } else if let Some(nanos) = timestamp.timestamp_nanos_opt() {
+                            } else if let Some(nanos) = timestamp.and_utc().timestamp_nanos_opt() {
                                 builder.append_value(nanos)?;
                             } else {
                                 log::error!(
@@ -1141,7 +1137,7 @@ pub fn transform_response<V: ValueObject>(
                         },
                     },
                     {
-                        (ScalarValue::TimestampNanosecond(v, None), builder) => builder.append_option(v.clone())?,
+                        (ScalarValue::TimestampNanosecond(v, None), builder) => builder.append_option(*v)?,
                     }
                 )
             }
@@ -1177,7 +1173,7 @@ pub fn transform_response<V: ValueObject>(
                         },
                     },
                     {
-                        (ScalarValue::TimestampMillisecond(v, None), builder) => builder.append_option(v.clone())?,
+                        (ScalarValue::TimestampMillisecond(v, None), builder) => builder.append_option(*v)?,
                     }
                 )
             }
@@ -1217,7 +1213,7 @@ pub fn transform_response<V: ValueObject>(
                         }
                     },
                     {
-                        (ScalarValue::Date32(v), builder) => builder.append_option(v.clone())?,
+                        (ScalarValue::Date32(v), builder) => builder.append_option(*v)?,
                     }
                 )
             }
@@ -1279,7 +1275,7 @@ pub fn transform_response<V: ValueObject>(
                         // TODO
                     },
                     {
-                        (ScalarValue::IntervalYearMonth(v), builder) => builder.append_option(v.clone())?,
+                        (ScalarValue::IntervalYearMonth(v), builder) => builder.append_option(*v)?,
                     }
                 )
             }
@@ -1293,7 +1289,7 @@ pub fn transform_response<V: ValueObject>(
                         // TODO
                     },
                     {
-                        (ScalarValue::IntervalDayTime(v), builder) => builder.append_option(v.clone())?,
+                        (ScalarValue::IntervalDayTime(v), builder) => builder.append_option(*v)?,
                     }
                 )
             }
@@ -1307,7 +1303,7 @@ pub fn transform_response<V: ValueObject>(
                         // TODO
                     },
                     {
-                        (ScalarValue::IntervalMonthDayNano(v), builder) => builder.append_option(v.clone())?,
+                        (ScalarValue::IntervalMonthDayNano(v), builder) => builder.append_option(*v)?,
                     }
                 )
             }
diff --git a/rust/cubesql/cubesql/src/compile/engine/df/wrapper.rs b/rust/cubesql/cubesql/src/compile/engine/df/wrapper.rs
index 28ff55e6be..afae6974c0 100644
--- a/rust/cubesql/cubesql/src/compile/engine/df/wrapper.rs
+++ b/rust/cubesql/cubesql/src/compile/engine/df/wrapper.rs
@@ -35,7 +35,7 @@ use serde::{Deserialize, Serialize};
 use std::{
     any::Any,
     cmp::min,
-    collections::{HashMap, HashSet},
+    collections::{hash_map::Entry, HashMap, HashSet},
     convert::TryInto,
     fmt,
     future::Future,
@@ -146,7 +146,7 @@ impl SqlQuery {
     }
 
     pub fn extend_values(&mut self, values: impl IntoIterator<Item = Option<String>>) {
-        self.values.extend(values.into_iter());
+        self.values.extend(values);
     }
 
     pub fn replace_sql(&mut self, sql: String) {
@@ -346,11 +346,8 @@ impl ColumnRemapping {
     /// Replace every column expression in `expr` according to this remapping. Column expressions
     /// not present in `self` will stay the same.
     pub fn remap(&self, expr: &Expr) -> result::Result<Expr, CubeError> {
-        replace_col(
-            expr.clone(),
-            &self.column_remapping.iter().map(|(k, v)| (k, v)).collect(),
-        )
-        .map_err(|_| CubeError::internal(format!("Can't rename columns for expr: {expr:?}",)))
+        replace_col(expr.clone(), &self.column_remapping.iter().collect())
+            .map_err(|_| CubeError::internal(format!("Can't rename columns for expr: {expr:?}",)))
     }
 
     pub fn extend(&mut self, other: ColumnRemapping) {
@@ -514,7 +511,7 @@ pub struct SqlGenerationResult {
 static DATE_PART_REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new("^[A-Za-z_ ]+$").unwrap());
 
 macro_rules! generate_sql_for_timestamp {
-    (@generic $value:ident, $value_block:expr, $sql_generator:expr, $sql_query:expr) => {
+    (@generic $literal:ident, $value:ident, $value_block:expr, $sql_generator:expr, $sql_query:expr) => {
         if let Some($value) = $value {
             let value = $value_block.to_rfc3339_opts(SecondsFormat::Millis, true);
             (
@@ -530,27 +527,27 @@ macro_rules! generate_sql_for_timestamp {
                 $sql_query,
             )
         } else {
-            ("NULL".to_string(), $sql_query)
+            (Self::generate_null_for_literal($sql_generator, &$literal)?, $sql_query)
         }
     };
-    ($value:ident, timestamp, $sql_generator:expr, $sql_query:expr) => {
+    ($literal:ident, $value:ident, timestamp, $sql_generator:expr, $sql_query:expr) => {
         generate_sql_for_timestamp!(
-            @generic $value, { Utc.timestamp_opt($value as i64, 0).unwrap() }, $sql_generator, $sql_query
+            @generic $literal, $value, { Utc.timestamp_opt($value as i64, 0).unwrap() }, $sql_generator, $sql_query
         )
     };
-    ($value:ident, timestamp_millis_opt, $sql_generator:expr, $sql_query:expr) => {
+    ($literal:ident, $value:ident, timestamp_millis_opt, $sql_generator:expr, $sql_query:expr) => {
         generate_sql_for_timestamp!(
-            @generic $value, { Utc.timestamp_millis_opt($value as i64).unwrap() }, $sql_generator, $sql_query
+            @generic $literal, $value, { Utc.timestamp_millis_opt($value as i64).unwrap() }, $sql_generator, $sql_query
         )
     };
-    ($value:ident, timestamp_micros, $sql_generator:expr, $sql_query:expr) => {
+    ($literal:ident, $value:ident, timestamp_micros, $sql_generator:expr, $sql_query:expr) => {
         generate_sql_for_timestamp!(
-            @generic $value, { Utc.timestamp_micros($value as i64).unwrap() }, $sql_generator, $sql_query
+            @generic $literal, $value, { Utc.timestamp_micros($value as i64).unwrap() }, $sql_generator, $sql_query
         )
     };
-    ($value:ident, $method:ident, $sql_generator:expr, $sql_query:expr) => {
+    ($literal:ident, $value:ident, $method:ident, $sql_generator:expr, $sql_query:expr) => {
         generate_sql_for_timestamp!(
-            @generic $value, { Utc.$method($value as i64) }, $sql_generator, $sql_query
+            @generic $literal, $value, { Utc.$method($value as i64) }, $sql_generator, $sql_query
         )
     };
 }
@@ -736,6 +733,7 @@ impl CubeScanWrapperNode {
                         // And tuning literals to measures would require ugly wrapping with noop aggregation function
                         // TODO investigate Cube.js joins, try to implement dimension member expression
                         let mut has_literal_members = false;
+                        let mut has_duplicated_members = false;
                         let mut wrapper_exprs = vec![];
 
                         for (member, field) in
@@ -744,9 +742,18 @@ impl CubeScanWrapperNode {
                             let alias = remapper.add_column(&field.qualified_column())?;
                             let expr = match member {
                                 MemberField::Member(f) => {
-                                    member_to_alias.insert(f.to_string(), alias.clone());
-                                    // `alias` is column name that would be generated by Cube.js, just reference that
-                                    Expr::Column(Column::from_name(alias.clone()))
+                                    match member_to_alias.entry(f.to_string()) {
+                                        Entry::Vacant(entry) => {
+                                            entry.insert(alias.clone());
+                                            // `alias` is column name that would be generated by Cube.js, just reference that
+                                            Expr::Column(Column::from_name(alias.clone()))
+                                        }
+                                        Entry::Occupied(entry) => {
+                                            // This member already has an alias, generate wrapper that would use it
+                                            has_duplicated_members = true;
+                                            Expr::Column(Column::from_name(entry.get().clone()))
+                                        }
+                                    }
                                 }
                                 MemberField::Literal(value) => {
                                     has_literal_members = true;
@@ -773,7 +780,7 @@ impl CubeScanWrapperNode {
                             .await?;
 
                         // TODO is this check necessary?
-                        let sql = if has_literal_members {
+                        let sql = if has_literal_members || has_duplicated_members {
                             // Need to generate wrapper SELECT with literal columns
                             // Generated columns need to have same aliases as targets in `remapper`
                             // Because that's what plans higher up would use in generated SQL
@@ -1078,7 +1085,7 @@ impl CubeScanWrapperNode {
                                     alias: subq_alias.unwrap_or_else(|| alias.clone()),
                                     sql: subq_sql_string,
                                     condition: cond.clone(),
-                                    join_type: join_type.clone(),
+                                    join_type: join_type,
                                 });
                                 known_join_subqueries.insert(alias.clone());
                             }
@@ -1325,13 +1332,13 @@ impl CubeScanWrapperNode {
                                                         let aliased_column = aggr_expr
                                                             .iter()
                                                             .find_position(|e| {
-                                                                expr_name(e, &schema).map(|n| &n == &col_name).unwrap_or(false)
+                                                                expr_name(e, &schema).map(|n| n == col_name).unwrap_or(false)
                                                             })
                                                             .map(|(i, _)| aggregate[i].clone()).or_else(|| {
                                                             projection_expr
                                                                 .iter()
                                                                 .find_position(|e| {
-                                                                    expr_name(e, &schema).map(|n| &n == &col_name).unwrap_or(false)
+                                                                    expr_name(e, &schema).map(|n| n == col_name).unwrap_or(false)
                                                                 })
                                                                 .map(|(i, _)| {
                                                                     projection[i].clone()
@@ -1340,7 +1347,7 @@ impl CubeScanWrapperNode {
                                                             flat_group_expr
                                                                 .iter()
                                                                 .find_position(|e| {
-                                                                    expr_name(e, &schema).map(|n| &n == &col_name).unwrap_or(false)
+                                                                    expr_name(e, &schema).map(|n| n == col_name).unwrap_or(false)
                                                                 })
                                                                 .map(|(i, _)| group_by[i].clone())
                                                         }).ok_or_else(|| {
@@ -1368,7 +1375,7 @@ impl CubeScanWrapperNode {
                                         load_request.order.clone()
                                     },
                                     ungrouped: if let WrappedSelectType::Projection = select_type {
-                                        load_request.ungrouped.clone()
+                                        load_request.ungrouped
                                     } else {
                                         None
                                     },
@@ -1376,13 +1383,13 @@ impl CubeScanWrapperNode {
                                     limit: if let Some(limit) = limit {
                                         Some(limit as i32)
                                     } else {
-                                        load_request.limit.clone()
+                                        load_request.limit
                                     },
                                     // TODO is it okay to just override offset?
                                     offset: if let Some(offset) = offset {
                                         Some(offset as i32)
                                     } else {
-                                        load_request.offset.clone()
+                                        load_request.offset
                                     },
 
                                     // Original scan node can already have consumed filters from Logical plan
@@ -1599,6 +1606,27 @@ impl CubeScanWrapperNode {
             .map_err(|e| DataFusionError::Internal(format!("Can't generate SQL for type: {}", e)))
     }
 
+    fn generate_typed_null(
+        sql_generator: Arc<dyn SqlGenerator>,
+        data_type: Option<DataType>,
+    ) -> result::Result<String, DataFusionError> {
+        let Some(data_type) = data_type else {
+            return Ok("NULL".to_string());
+        };
+
+        let sql_type = Self::generate_sql_type(sql_generator.clone(), data_type)?;
+        let result = Self::generate_sql_cast_expr(sql_generator, "NULL".to_string(), sql_type)?;
+        Ok(result)
+    }
+
+    fn generate_null_for_literal(
+        sql_generator: Arc<dyn SqlGenerator>,
+        value: &ScalarValue,
+    ) -> result::Result<String, DataFusionError> {
+        let data_type = value.get_datatype();
+        Self::generate_typed_null(sql_generator, Some(data_type))
+    }
+
     /// This function is async to be able to call to JS land,
     /// in case some SQL generation could not be done through Jinja
     pub fn generate_sql_for_expr<'ctx>(
@@ -2076,15 +2104,25 @@ impl CubeScanWrapperNode {
                                         ))
                                     })
                             })
-                            .unwrap_or(Ok("NULL".to_string()))?,
+                            .transpose()?
+                            .map_or_else(
+                                || Self::generate_null_for_literal(sql_generator, &literal),
+                                Ok,
+                            )?,
                             sql_query,
                         ),
                         ScalarValue::Float32(f) => (
-                            f.map(|f| format!("{}", f)).unwrap_or("NULL".to_string()),
+                            f.map(|f| format!("{f}")).map_or_else(
+                                || Self::generate_null_for_literal(sql_generator, &literal),
+                                Ok,
+                            )?,
                             sql_query,
                         ),
                         ScalarValue::Float64(f) => (
-                            f.map(|f| format!("{}", f)).unwrap_or("NULL".to_string()),
+                            f.map(|f| format!("{f}")).map_or_else(
+                                || Self::generate_null_for_literal(sql_generator, &literal),
+                                Ok,
+                            )?,
                             sql_query,
                         ),
                         ScalarValue::Decimal128(x, precision, scale) => {
@@ -2104,41 +2142,65 @@ impl CubeScanWrapperNode {
                                         data_type,
                                     )?
                                 } else {
-                                    "NULL".to_string()
+                                    Self::generate_null_for_literal(sql_generator, &literal)?
                                 },
                                 sql_query,
                             )
                         }
                         ScalarValue::Int8(x) => (
-                            x.map(|x| format!("{}", x)).unwrap_or("NULL".to_string()),
+                            x.map(|x| format!("{x}")).map_or_else(
+                                || Self::generate_null_for_literal(sql_generator, &literal),
+                                Ok,
+                            )?,
                             sql_query,
                         ),
                         ScalarValue::Int16(x) => (
-                            x.map(|x| format!("{}", x)).unwrap_or("NULL".to_string()),
+                            x.map(|x| format!("{x}")).map_or_else(
+                                || Self::generate_null_for_literal(sql_generator, &literal),
+                                Ok,
+                            )?,
                             sql_query,
                         ),
                         ScalarValue::Int32(x) => (
-                            x.map(|x| format!("{}", x)).unwrap_or("NULL".to_string()),
+                            x.map(|x| format!("{x}")).map_or_else(
+                                || Self::generate_null_for_literal(sql_generator, &literal),
+                                Ok,
+                            )?,
                             sql_query,
                         ),
                         ScalarValue::Int64(x) => (
-                            x.map(|x| format!("{}", x)).unwrap_or("NULL".to_string()),
+                            x.map(|x| format!("{x}")).map_or_else(
+                                || Self::generate_null_for_literal(sql_generator, &literal),
+                                Ok,
+                            )?,
                             sql_query,
                         ),
                         ScalarValue::UInt8(x) => (
-                            x.map(|x| format!("{}", x)).unwrap_or("NULL".to_string()),
+                            x.map(|x| format!("{x}")).map_or_else(
+                                || Self::generate_null_for_literal(sql_generator, &literal),
+                                Ok,
+                            )?,
                             sql_query,
                         ),
                         ScalarValue::UInt16(x) => (
-                            x.map(|x| format!("{}", x)).unwrap_or("NULL".to_string()),
+                            x.map(|x| format!("{x}")).map_or_else(
+                                || Self::generate_null_for_literal(sql_generator, &literal),
+                                Ok,
+                            )?,
                             sql_query,
                         ),
                         ScalarValue::UInt32(x) => (
-                            x.map(|x| format!("{}", x)).unwrap_or("NULL".to_string()),
+                            x.map(|x| format!("{x}")).map_or_else(
+                                || Self::generate_null_for_literal(sql_generator, &literal),
+                                Ok,
+                            )?,
                             sql_query,
                         ),
                         ScalarValue::UInt64(x) => (
-                            x.map(|x| format!("{}", x)).unwrap_or("NULL".to_string()),
+                            x.map(|x| format!("{x}")).map_or_else(
+                                || Self::generate_null_for_literal(sql_generator, &literal),
+                                Ok,
+                            )?,
                             sql_query,
                         ),
                         ScalarValue::Utf8(x) => {
@@ -2146,7 +2208,10 @@ impl CubeScanWrapperNode {
                                 let param_index = sql_query.add_value(x);
                                 (format!("${}$", param_index), sql_query)
                             } else {
-                                ("NULL".into(), sql_query)
+                                (
+                                    Self::generate_typed_null(sql_generator, Some(DataType::Utf8))?,
+                                    sql_query,
+                                )
                             }
                         }
                         // ScalarValue::LargeUtf8(_) => {}
@@ -2187,42 +2252,54 @@ impl CubeScanWrapperNode {
                                     sql_query,
                                 )
                             } else {
-                                ("NULL".to_string(), sql_query)
+                                (
+                                    Self::generate_null_for_literal(sql_generator, &literal)?,
+                                    sql_query,
+                                )
                             }
                         }
                         // ScalarValue::Date64(_) => {}
 
                         // generate_sql_for_timestamp will call Utc constructors, so only support UTC zone for now
                         // DataFusion can return "UTC" for stuff like `NOW()` during constant folding
-                        ScalarValue::TimestampSecond(s, tz)
+                        ScalarValue::TimestampSecond(s, ref tz)
                             if matches!(tz.as_deref(), None | Some("UTC")) =>
                         {
-                            generate_sql_for_timestamp!(s, timestamp, sql_generator, sql_query)
+                            generate_sql_for_timestamp!(
+                                literal,
+                                s,
+                                timestamp,
+                                sql_generator,
+                                sql_query
+                            )
                         }
-                        ScalarValue::TimestampMillisecond(ms, tz)
+                        ScalarValue::TimestampMillisecond(ms, ref tz)
                             if matches!(tz.as_deref(), None | Some("UTC")) =>
                         {
                             generate_sql_for_timestamp!(
+                                literal,
                                 ms,
                                 timestamp_millis_opt,
                                 sql_generator,
                                 sql_query
                             )
                         }
-                        ScalarValue::TimestampMicrosecond(ms, tz)
+                        ScalarValue::TimestampMicrosecond(ms, ref tz)
                             if matches!(tz.as_deref(), None | Some("UTC")) =>
                         {
                             generate_sql_for_timestamp!(
+                                literal,
                                 ms,
                                 timestamp_micros,
                                 sql_generator,
                                 sql_query
                             )
                         }
-                        ScalarValue::TimestampNanosecond(nanoseconds, tz)
+                        ScalarValue::TimestampNanosecond(nanoseconds, ref tz)
                             if matches!(tz.as_deref(), None | Some("UTC")) =>
                         {
                             generate_sql_for_timestamp!(
+                                literal,
                                 nanoseconds,
                                 timestamp_nanos,
                                 sql_generator,
@@ -2246,7 +2323,10 @@ impl CubeScanWrapperNode {
                                     sql_query,
                                 )
                             } else {
-                                ("NULL".to_string(), sql_query)
+                                (
+                                    Self::generate_null_for_literal(sql_generator, &literal)?,
+                                    sql_query,
+                                )
                             }
                         }
                         ScalarValue::IntervalDayTime(x) => {
@@ -2256,7 +2336,10 @@ impl CubeScanWrapperNode {
                                 let generated_sql = decomposed.generate_interval_sql(&templates)?;
                                 (generated_sql, sql_query)
                             } else {
-                                ("NULL".to_string(), sql_query)
+                                (
+                                    Self::generate_null_for_literal(sql_generator, &literal)?,
+                                    sql_query,
+                                )
                             }
                         }
                         ScalarValue::IntervalMonthDayNano(x) => {
@@ -2266,11 +2349,16 @@ impl CubeScanWrapperNode {
                                 let generated_sql = decomposed.generate_interval_sql(&templates)?;
                                 (generated_sql, sql_query)
                             } else {
-                                ("NULL".to_string(), sql_query)
+                                (
+                                    Self::generate_null_for_literal(sql_generator, &literal)?,
+                                    sql_query,
+                                )
                             }
                         }
                         // ScalarValue::Struct(_, _) => {}
-                        ScalarValue::Null => ("NULL".to_string(), sql_query),
+                        ScalarValue::Null => {
+                            (Self::generate_typed_null(sql_generator, None)?, sql_query)
+                        }
                         x => {
                             return Err(DataFusionError::Internal(format!(
                                 "Can't generate SQL for literal: {:?}",
diff --git a/rust/cubesql/cubesql/src/compile/engine/udf/common.rs b/rust/cubesql/cubesql/src/compile/engine/udf/common.rs
index 20f57f8137..853252f04a 100644
--- a/rust/cubesql/cubesql/src/compile/engine/udf/common.rs
+++ b/rust/cubesql/cubesql/src/compile/engine/udf/common.rs
@@ -815,7 +815,7 @@ pub fn create_convert_tz_udf() -> ScalarUDF {
         }
 
         if let Some(tz) = input_tz {
-            if tz != &"UTC" {
+            if tz != "UTC" {
                 return Err(DataFusionError::NotImplemented(format!(
                     "convert_tz does not non UTC timezone as input, actual {}",
                     tz
@@ -1021,7 +1021,7 @@ pub fn create_date_udf() -> ScalarUDF {
         assert!(args.len() == 1);
 
         let mut args = args
-            .into_iter()
+            .iter()
             .map(|i| -> Result<ColumnarValue> {
                 if let Some(strings) = i.as_any().downcast_ref::<StringArray>() {
                     let mut builder = TimestampNanosecondArray::builder(strings.len());
@@ -1491,14 +1491,14 @@ fn date_addsub_day_time(
 }
 
 fn change_ym(t: NaiveDateTime, y: i32, m: u32) -> Option<NaiveDateTime> {
-    debug_assert!(1 <= m && m <= 12);
+    debug_assert!((1..=12).contains(&m));
     let mut d = t.day();
     d = d.min(last_day_of_month(y, m));
     t.with_day(1)?.with_year(y)?.with_month(m)?.with_day(d)
 }
 
 fn last_day_of_month(y: i32, m: u32) -> u32 {
-    debug_assert!(1 <= m && m <= 12);
+    debug_assert!((1..=12).contains(&m));
     if m == 12 {
         return 31;
     }
@@ -1669,7 +1669,8 @@ pub fn create_to_char_udf() -> ScalarUDF {
 
                     let secs = duration.num_seconds();
                     let nanosecs = duration.num_nanoseconds().unwrap_or(0) - secs * 1_000_000_000;
-                    let timestamp = NaiveDateTime::from_timestamp_opt(secs, nanosecs as u32)
+                    let timestamp = ::chrono::DateTime::from_timestamp(secs, nanosecs as u32)
+                        .map(|dt| dt.naive_utc())
                         .unwrap_or_else(|| panic!("Invalid secs {} nanosecs {}", secs, nanosecs));
 
                     // chrono's strftime is missing quarter format, as such a workaround is required
@@ -2316,7 +2317,8 @@ macro_rules! generate_series_udtf {
 
 macro_rules! generate_series_helper_date32 {
     ($CURRENT:ident, $STEP:ident, $PRIMITIVE_TYPE: ident) => {
-        let current_dt = NaiveDateTime::from_timestamp_opt(($CURRENT as i64) * 86400, 0)
+        let current_dt = ::chrono::DateTime::from_timestamp(($CURRENT as i64) * 86400, 0)
+            .map(|dt| dt.naive_utc())
             .ok_or_else(|| {
                 DataFusionError::Execution(format!(
                     "Cannot convert date to NaiveDateTime: {}",
@@ -2324,16 +2326,17 @@ macro_rules! generate_series_helper_date32 {
                 ))
             })?;
         let res = date_addsub_month_day_nano(current_dt, $STEP, true)?;
-        $CURRENT = (res.timestamp() / 86400) as $PRIMITIVE_TYPE;
+        $CURRENT = (res.and_utc().timestamp() / 86400) as $PRIMITIVE_TYPE;
     };
 }
 
 macro_rules! generate_series_helper_timestamp {
     ($CURRENT:ident, $STEP:ident, $PRIMITIVE_TYPE: ident) => {
-        let current_dt = NaiveDateTime::from_timestamp_opt(
+        let current_dt = ::chrono::DateTime::from_timestamp(
             ($CURRENT as i64) / 1_000_000_000,
             ($CURRENT % 1_000_000_000) as u32,
         )
+        .map(|dt| dt.naive_utc())
         .ok_or_else(|| {
             DataFusionError::Execution(format!(
                 "Cannot convert timestamp to NaiveDateTime: {}",
diff --git a/rust/cubesql/cubesql/src/compile/engine/variable_provider.rs b/rust/cubesql/cubesql/src/compile/engine/variable_provider.rs
index d3c68b9989..24afdb8444 100644
--- a/rust/cubesql/cubesql/src/compile/engine/variable_provider.rs
+++ b/rust/cubesql/cubesql/src/compile/engine/variable_provider.rs
@@ -25,7 +25,7 @@ impl VariablesProvider {
 
     fn get_session_value(&self, identifier: Vec<String>, var_type: VarType) -> Result<ScalarValue> {
         let key = if identifier.len() > 1 {
-            let ignore_first = identifier[0].to_ascii_lowercase() == "@@session";
+            let ignore_first = identifier[0].eq_ignore_ascii_case("@@session");
             if ignore_first {
                 identifier[1..].concat()
             } else {
@@ -48,7 +48,7 @@ impl VariablesProvider {
 
     fn get_global_value(&self, identifier: Vec<String>) -> Result<ScalarValue> {
         let key = if identifier.len() > 1 {
-            let ignore_first = identifier[0].to_ascii_lowercase() == "@@global";
+            let ignore_first = identifier[0].eq_ignore_ascii_case("@@global");
 
             if ignore_first {
                 identifier[1..].concat()
@@ -85,7 +85,7 @@ impl VarProvider for VariablesProvider {
 
         match (&first_word_vec[0], &first_word_vec[1]) {
             ('@', '@') => {
-                if identifier.len() > 1 && identifier[0].to_ascii_lowercase() == "@@session" {
+                if identifier.len() > 1 && identifier[0].eq_ignore_ascii_case("@@session") {
                     return self.get_session_value(identifier, VarType::System);
                 }
 
diff --git a/rust/cubesql/cubesql/src/compile/error.rs b/rust/cubesql/cubesql/src/compile/error.rs
index 47aaa9cc4b..4bfd75f901 100644
--- a/rust/cubesql/cubesql/src/compile/error.rs
+++ b/rust/cubesql/cubesql/src/compile/error.rs
@@ -1,17 +1,34 @@
-use std::{backtrace::Backtrace, collections::HashMap};
+use std::{backtrace::Backtrace, collections::HashMap, fmt::Formatter};
 
-#[derive(thiserror::Error, Debug)]
+/// TODO: Migrate back to thiserror crate, when Rust will stabilize feature(error_generic_member_access)
+#[derive(Debug)]
 pub enum CompilationError {
-    #[error("SQLCompilationError: Internal: {0}")]
     Internal(String, Backtrace, Option<HashMap<String, String>>),
-    #[error("SQLCompilationError: User: {0}")]
     User(String, Option<HashMap<String, String>>),
-    #[error("SQLCompilationError: Unsupported: {0}")]
     Unsupported(String, Option<HashMap<String, String>>),
-    #[error("SQLCompilationError: Fatal: {0}")]
     Fatal(String, Option<HashMap<String, String>>),
 }
 
+impl std::fmt::Display for CompilationError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            CompilationError::Internal(message, _, _) => {
+                f.write_fmt(format_args!("SQLCompilationError: Internal: {}", message))
+            }
+            CompilationError::User(message, _) => {
+                f.write_fmt(format_args!("SQLCompilationError: User: {}", message))
+            }
+            CompilationError::Unsupported(message, _) => f.write_fmt(format_args!(
+                "SQLCompilationError: Unsupported: {}",
+                message
+            )),
+            CompilationError::Fatal(message, _) => {
+                f.write_fmt(format_args!("SQLCompilationError: Fatal: {}", message))
+            }
+        }
+    }
+}
+
 impl PartialEq for CompilationError {
     fn eq(&self, other: &Self) -> bool {
         match &self {
diff --git a/rust/cubesql/cubesql/src/compile/mod.rs b/rust/cubesql/cubesql/src/compile/mod.rs
index 5d1691ffe5..86a0b76db7 100644
--- a/rust/cubesql/cubesql/src/compile/mod.rs
+++ b/rust/cubesql/cubesql/src/compile/mod.rs
@@ -2219,7 +2219,10 @@ limit
                     V1LoadRequestQueryTimeDimension {
                         dimension: "KibanaSampleDataEcommerce.order_date".to_string(),
                         granularity: Some("month".to_string()),
-                        date_range: None,
+                        date_range: Some(json!(vec![
+                            "2023-07-08T00:00:00.000Z".to_string(),
+                            "2023-10-07T23:59:59.999Z".to_string()
+                        ])),
                     }
                 ]),
                 order: Some(vec![]),
@@ -2780,7 +2783,7 @@ limit
 
     #[tokio::test]
     async fn test_select_error() {
-        let variants = vec![
+        let variants = [
             (
                 "SELECT AVG(maxPrice) FROM KibanaSampleDataEcommerce".to_string(),
                 CompilationError::user("Error during rewrite: Measure aggregation type doesn't match. The aggregation type for 'maxPrice' is 'MAX()' but 'AVG()' was provided. Please check logs for additional information.".to_string()),
@@ -5800,8 +5803,8 @@ ORDER BY
     #[tokio::test]
     async fn test_interval_mul() -> Result<(), CubeError> {
         let base_timestamp = "TO_TIMESTAMP('2020-01-01 00:00:00', 'yyyy-MM-dd HH24:mi:ss')";
-        let units = vec!["year", "month", "week", "day", "hour", "minute", "second"];
-        let multiplicands = vec!["1", "5", "-10", "1.5"];
+        let units = ["year", "month", "week", "day", "hour", "minute", "second"];
+        let multiplicands = ["1", "5", "-10", "1.5"];
 
         let selects = units
             .iter()
@@ -5836,8 +5839,8 @@ ORDER BY
     #[tokio::test]
     async fn test_interval_div() -> Result<(), CubeError> {
         let base_timestamp = "TO_TIMESTAMP('2020-01-01 00:00:00', 'yyyy-MM-dd HH24:mi:ss')";
-        let units = vec!["year", "month", "week", "day", "hour", "minute", "second"];
-        let divisors = vec!["1.5"];
+        let units = ["year", "month", "week", "day", "hour", "minute", "second"];
+        let divisors = ["1.5"];
 
         let selects = units
             .iter()
@@ -7937,7 +7940,7 @@ ORDER BY "source"."str0" ASC
         }
         init_testing_logger();
 
-        for fun in vec!["Max", "Min"].iter() {
+        for fun in ["Max", "Min"].iter() {
             let logical_plan = convert_select_to_query_plan(
                 format!(
                     "
@@ -8205,6 +8208,184 @@ ORDER BY "source"."str0" ASC
         )
     }
 
+    #[tokio::test]
+    async fn test_select_distinct_dimensions() {
+        if !Rewriter::sql_push_down_enabled() {
+            return;
+        }
+        init_testing_logger();
+
+        let logical_plan = convert_select_to_query_plan(
+            "SELECT DISTINCT customer_gender FROM KibanaSampleDataEcommerce".to_string(),
+            DatabaseProtocol::PostgreSQL,
+        )
+        .await
+        .as_logical_plan();
+
+        println!("logical_plan: {:?}", logical_plan);
+
+        assert_eq!(
+            logical_plan.find_cube_scan().request,
+            V1LoadRequestQuery {
+                measures: Some(vec![]),
+                dimensions: Some(vec![
+                    "KibanaSampleDataEcommerce.customer_gender".to_string(),
+                ]),
+                segments: Some(vec![]),
+                order: Some(vec![]),
+                ..Default::default()
+            }
+        );
+
+        let logical_plan = convert_select_to_query_plan(
+            "SELECT DISTINCT customer_gender FROM KibanaSampleDataEcommerce LIMIT 100".to_string(),
+            DatabaseProtocol::PostgreSQL,
+        )
+        .await
+        .as_logical_plan();
+
+        println!("logical_plan: {:?}", logical_plan);
+
+        assert_eq!(
+            logical_plan.find_cube_scan().request,
+            V1LoadRequestQuery {
+                measures: Some(vec![]),
+                dimensions: Some(vec![
+                    "KibanaSampleDataEcommerce.customer_gender".to_string(),
+                ]),
+                segments: Some(vec![]),
+                order: Some(vec![]),
+                limit: Some(100),
+                ..Default::default()
+            }
+        );
+
+        let logical_plan = convert_select_to_query_plan(
+            "SELECT DISTINCT * FROM (SELECT customer_gender FROM KibanaSampleDataEcommerce LIMIT 100) q_0".to_string(),
+            DatabaseProtocol::PostgreSQL,
+        )
+        .await
+        .as_logical_plan();
+
+        println!("logical_plan: {:?}", logical_plan);
+
+        assert_eq!(
+            logical_plan.find_cube_scan().request,
+            V1LoadRequestQuery {
+                measures: Some(vec![]),
+                dimensions: Some(vec![
+                    "KibanaSampleDataEcommerce.customer_gender".to_string(),
+                ]),
+                segments: Some(vec![]),
+                order: Some(vec![]),
+                limit: Some(100),
+                ungrouped: Some(true),
+                ..Default::default()
+            }
+        );
+
+        let logical_plan = convert_select_to_query_plan(
+            "SELECT DISTINCT customer_gender, order_date FROM KibanaSampleDataEcommerce"
+                .to_string(),
+            DatabaseProtocol::PostgreSQL,
+        )
+        .await
+        .as_logical_plan();
+
+        println!("logical_plan: {:?}", logical_plan);
+
+        assert_eq!(
+            logical_plan.find_cube_scan().request,
+            V1LoadRequestQuery {
+                measures: Some(vec![]),
+                dimensions: Some(vec![
+                    "KibanaSampleDataEcommerce.customer_gender".to_string(),
+                    "KibanaSampleDataEcommerce.order_date".to_string(),
+                ]),
+                segments: Some(vec![]),
+                order: Some(vec![]),
+                ..Default::default()
+            }
+        );
+
+        let logical_plan = convert_select_to_query_plan(
+            "SELECT DISTINCT MAX(maxPrice) FROM KibanaSampleDataEcommerce".to_string(),
+            DatabaseProtocol::PostgreSQL,
+        )
+        .await
+        .as_logical_plan();
+
+        println!("logical_plan: {:?}", logical_plan);
+
+        assert_eq!(
+            logical_plan.find_cube_scan().request,
+            V1LoadRequestQuery {
+                measures: Some(vec!["KibanaSampleDataEcommerce.maxPrice".to_string(),]),
+                dimensions: Some(vec![]),
+                segments: Some(vec![]),
+                order: Some(vec![]),
+                ..Default::default()
+            }
+        );
+
+        let logical_plan = convert_select_to_query_plan(
+            "SELECT DISTINCT * FROM (SELECT customer_gender, MAX(maxPrice) FROM KibanaSampleDataEcommerce GROUP BY 1) q_0".to_string(),
+            DatabaseProtocol::PostgreSQL,
+        )
+        .await
+        .as_logical_plan();
+
+        println!("logical_plan: {:?}", logical_plan);
+
+        assert_eq!(
+            logical_plan.find_cube_scan().request,
+            V1LoadRequestQuery {
+                measures: Some(vec!["KibanaSampleDataEcommerce.maxPrice".to_string(),]),
+                dimensions: Some(vec![
+                    "KibanaSampleDataEcommerce.customer_gender".to_string(),
+                ]),
+                segments: Some(vec![]),
+                order: Some(vec![]),
+                ..Default::default()
+            }
+        );
+
+        let logical_plan = convert_select_to_query_plan(
+            "SELECT DISTINCT * FROM KibanaSampleDataEcommerce".to_string(),
+            DatabaseProtocol::PostgreSQL,
+        )
+        .await
+        .as_logical_plan();
+
+        println!("logical_plan: {:?}", logical_plan);
+
+        assert_eq!(
+            logical_plan.find_cube_scan().request,
+            V1LoadRequestQuery {
+                measures: Some(vec![
+                    "KibanaSampleDataEcommerce.count".to_string(),
+                    "KibanaSampleDataEcommerce.maxPrice".to_string(),
+                    "KibanaSampleDataEcommerce.sumPrice".to_string(),
+                    "KibanaSampleDataEcommerce.minPrice".to_string(),
+                    "KibanaSampleDataEcommerce.avgPrice".to_string(),
+                    "KibanaSampleDataEcommerce.countDistinct".to_string(),
+                ]),
+                dimensions: Some(vec![
+                    "KibanaSampleDataEcommerce.order_date".to_string(),
+                    "KibanaSampleDataEcommerce.last_mod".to_string(),
+                    "KibanaSampleDataEcommerce.customer_gender".to_string(),
+                    "KibanaSampleDataEcommerce.notes".to_string(),
+                    "KibanaSampleDataEcommerce.taxful_total_price".to_string(),
+                    "KibanaSampleDataEcommerce.has_subscription".to_string(),
+                ]),
+                segments: Some(vec![]),
+                order: Some(vec![]),
+                ungrouped: Some(true),
+                ..Default::default()
+            }
+        )
+    }
+
     #[tokio::test]
     async fn test_sort_relations() -> Result<(), CubeError> {
         init_testing_logger();
@@ -8411,8 +8592,7 @@ ORDER BY "source"."str0" ASC
     async fn test_holistics_group_by_date() {
         init_testing_logger();
 
-        for granularity in vec!["year", "quarter", "month", "week", "day", "hour", "minute"].iter()
-        {
+        for granularity in ["year", "quarter", "month", "week", "day", "hour", "minute"].iter() {
             let logical_plan = convert_select_to_query_plan(
                 format!("
                     SELECT
@@ -15665,8 +15845,10 @@ LIMIT {{ limit }}{% endif %}"#.to_string(),
                     "KibanaSampleDataEcommerce.customer_gender".to_string(),
                 ]),
                 segments: Some(vec![]),
-                order: Some(vec![]),
-                ungrouped: Some(true),
+                order: Some(vec![vec![
+                    "KibanaSampleDataEcommerce.customer_gender".to_string(),
+                    "asc".to_string()
+                ],]),
                 ..Default::default()
             }
         )
diff --git a/rust/cubesql/cubesql/src/compile/plan.rs b/rust/cubesql/cubesql/src/compile/plan.rs
index e9f474da1a..bf941cb269 100644
--- a/rust/cubesql/cubesql/src/compile/plan.rs
+++ b/rust/cubesql/cubesql/src/compile/plan.rs
@@ -138,15 +138,14 @@ pub async fn get_df_batches(
                         Ok(stream) => {
                             return Ok(stream);
                         }
-                        Err(err) => return Err(CubeError::panic(Box::new(err)).into()),
+                        Err(err) => return Err(CubeError::panic(Box::new(err))),
                     };
                 }
-                Err(err) => return Err(CubeError::panic(err).into()),
+                Err(err) => return Err(CubeError::panic(err)),
             }
         }
         _ => Err(CubeError::user(
             "Only SELECT queries are supported for Cube SQL over HTTP".to_string(),
-        )
-        .into()),
+        )),
     }
 }
diff --git a/rust/cubesql/cubesql/src/compile/query_engine.rs b/rust/cubesql/cubesql/src/compile/query_engine.rs
index dac6c9cddc..c3c9fbf6b9 100644
--- a/rust/cubesql/cubesql/src/compile/query_engine.rs
+++ b/rust/cubesql/cubesql/src/compile/query_engine.rs
@@ -8,7 +8,7 @@ use crate::{
     compile::{
         engine::{
             df::{
-                optimizers::{FilterPushDown, LimitPushDown, SortPushDown},
+                optimizers::{FilterPushDown, FilterSplitMeta, LimitPushDown, SortPushDown},
                 scan::CubeScanNode,
                 wrapper::CubeScanWrapperNode,
             },
@@ -104,7 +104,7 @@ pub trait QueryEngine {
                     .log_load_state(
                         Some(span_id.clone()),
                         auth_context,
-                        state.get_load_request_meta(),
+                        state.get_load_request_meta("sql"),
                         "SQL API Query Planning".to_string(),
                         serde_json::json!({
                             "query": span_id.query_key.clone(),
@@ -142,6 +142,7 @@ pub trait QueryEngine {
             Arc::new(FilterPushDown::new()),
             Arc::new(SortPushDown::new()),
             Arc::new(LimitPushDown::new()),
+            Arc::new(FilterSplitMeta::new()),
         ];
         for optimizer in optimizers {
             // TODO: report an error when the plan can't be optimized
@@ -286,7 +287,7 @@ pub trait QueryEngine {
                     .log_load_state(
                         Some(span_id.clone()),
                         auth_context,
-                        state.get_load_request_meta(),
+                        state.get_load_request_meta("sql"),
                         "SQL API Query Planning Success".to_string(),
                         serde_json::json!({
                             "query": span_id.query_key.clone(),
@@ -302,7 +303,7 @@ pub trait QueryEngine {
         // to catch all SQL generation errors during planning
         let rewrite_plan = Self::evaluate_wrapped_sql(
             self.transport_ref().clone(),
-            Arc::new(state.get_load_request_meta()),
+            Arc::new(state.get_load_request_meta("sql")),
             rewrite_plan,
         )
         .await?;
@@ -390,7 +391,7 @@ impl QueryEngine for SqlQueryEngine {
     ) -> Result<DFSessionContext, CompilationError> {
         let query_planner = Arc::new(CubeQueryPlanner::new(
             self.transport_ref().clone(),
-            state.get_load_request_meta(),
+            state.get_load_request_meta("sql"),
             self.config_ref().clone(),
         ));
         let mut ctx = DFSessionContext::with_state(
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/analysis.rs b/rust/cubesql/cubesql/src/compile/rewrite/analysis.rs
index ff911a5951..574a8e205a 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/analysis.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/analysis.rs
@@ -350,7 +350,7 @@ impl LogicalPlanAnalysis {
         egraph: &EGraph<LogicalPlanLanguage, Self>,
         enode: &LogicalPlanLanguage,
     ) -> Option<usize> {
-        let trivial_push_down = |id| egraph.index(id).data.trivial_push_down.clone();
+        let trivial_push_down = |id| egraph.index(id).data.trivial_push_down;
         match enode {
             LogicalPlanLanguage::ColumnExpr(_) => Some(0),
             LogicalPlanLanguage::LiteralExpr(_) => Some(0),
@@ -714,12 +714,12 @@ impl LogicalPlanAnalysis {
             }
             LogicalPlanLanguage::CubeScanMembers(params) => {
                 for id in params.iter() {
-                    map.extend(id_to_column_name_to_expr(*id)?.into_iter());
+                    map.extend(id_to_column_name_to_expr(*id)?);
                 }
                 Some(map)
             }
             LogicalPlanLanguage::CubeScan(params) => {
-                map.extend(id_to_column_name_to_expr(params[1])?.into_iter());
+                map.extend(id_to_column_name_to_expr(params[1])?);
                 Some(map)
             }
             _ => None,
@@ -843,7 +843,7 @@ impl LogicalPlanAnalysis {
                 let expr = Expr::Column(col);
                 columns.push(expr);
             } else {
-                columns.extend(referenced_columns(id)?.into_iter());
+                columns.extend(referenced_columns(id)?);
             }
             Some(())
         };
@@ -1244,7 +1244,7 @@ impl LogicalPlanAnalysis {
         egraph: &EGraph<LogicalPlanLanguage, Self>,
         enode: &LogicalPlanLanguage,
     ) -> Option<bool> {
-        let is_empty_list = |id| egraph.index(id).data.is_empty_list.clone();
+        let is_empty_list = |id| egraph.index(id).data.is_empty_list;
         match enode {
             LogicalPlanLanguage::FilterOpFilters(params)
             | LogicalPlanLanguage::CubeScanFilters(params)
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/converter.rs b/rust/cubesql/cubesql/src/compile/rewrite/converter.rs
index dc65029915..bf301b76e2 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/converter.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/converter.rs
@@ -352,8 +352,7 @@ impl LogicalPlanToLanguageConverter {
                 let expr = add_expr_list_node!(graph, expr, query_params, CaseExprExpr, flat_list);
                 let when_then_expr = when_then_expr
                     .iter()
-                    .map(|(when, then)| vec![when, then])
-                    .flatten()
+                    .flat_map(|(when, then)| [when, then])
                     .collect::<Vec<_>>();
                 let when_then_expr = add_expr_list_node!(
                     graph,
@@ -932,7 +931,7 @@ macro_rules! match_expr_list_node {
                     }
                 }
                 _ => {
-                    result.push(to_expr(id.clone())?);
+                    result.push(to_expr(id)?);
                 }
             }
             Ok(())
@@ -988,7 +987,7 @@ pub fn node_to_expr(
 ) -> Result<Expr, CubeError> {
     Ok(match node {
         LogicalPlanLanguage::AliasExpr(params) => {
-            let expr = to_expr(params[0].clone())?;
+            let expr = to_expr(params[0])?;
             let alias = match_data_node!(node_by_id, params[1], AliasExprAlias);
             Expr::Alias(Box::new(expr), alias)
         }
@@ -1011,9 +1010,9 @@ pub fn node_to_expr(
             Expr::Literal(value)
         }
         LogicalPlanLanguage::AnyExpr(params) => {
-            let left = Box::new(to_expr(params[0].clone())?);
+            let left = Box::new(to_expr(params[0])?);
             let op = match_data_node!(node_by_id, params[1], AnyExprOp);
-            let right = Box::new(to_expr(params[2].clone())?);
+            let right = Box::new(to_expr(params[2])?);
             let all = match_data_node!(node_by_id, params[3], AnyExprAll);
             Expr::AnyExpr {
                 left,
@@ -1023,16 +1022,16 @@ pub fn node_to_expr(
             }
         }
         LogicalPlanLanguage::BinaryExpr(params) => {
-            let left = Box::new(to_expr(params[0].clone())?);
+            let left = Box::new(to_expr(params[0])?);
             let op = match_data_node!(node_by_id, params[1], BinaryExprOp);
-            let right = Box::new(to_expr(params[2].clone())?);
+            let right = Box::new(to_expr(params[2])?);
             Expr::BinaryExpr { left, op, right }
         }
         LogicalPlanLanguage::LikeExpr(params) => {
             let like_type = match_data_node!(node_by_id, params[0], LikeExprLikeType);
             let negated = match_data_node!(node_by_id, params[1], LikeExprNegated);
-            let expr = Box::new(to_expr(params[2].clone())?);
-            let pattern = Box::new(to_expr(params[3].clone())?);
+            let expr = Box::new(to_expr(params[2])?);
+            let pattern = Box::new(to_expr(params[3])?);
             let escape_char = match_data_node!(node_by_id, params[4], LikeExprEscapeChar);
             let like_expr = Like {
                 negated,
@@ -1047,26 +1046,26 @@ pub fn node_to_expr(
             }
         }
         LogicalPlanLanguage::NotExpr(params) => {
-            let expr = Box::new(to_expr(params[0].clone())?);
+            let expr = Box::new(to_expr(params[0])?);
             Expr::Not(expr)
         }
         LogicalPlanLanguage::IsNotNullExpr(params) => {
-            let expr = Box::new(to_expr(params[0].clone())?);
+            let expr = Box::new(to_expr(params[0])?);
             Expr::IsNotNull(expr)
         }
         LogicalPlanLanguage::IsNullExpr(params) => {
-            let expr = Box::new(to_expr(params[0].clone())?);
+            let expr = Box::new(to_expr(params[0])?);
             Expr::IsNull(expr)
         }
         LogicalPlanLanguage::NegativeExpr(params) => {
-            let expr = Box::new(to_expr(params[0].clone())?);
+            let expr = Box::new(to_expr(params[0])?);
             Expr::Negative(expr)
         }
         LogicalPlanLanguage::BetweenExpr(params) => {
-            let expr = Box::new(to_expr(params[0].clone())?);
+            let expr = Box::new(to_expr(params[0])?);
             let negated = match_data_node!(node_by_id, params[1], BetweenExprNegated);
-            let low = Box::new(to_expr(params[2].clone())?);
-            let high = Box::new(to_expr(params[3].clone())?);
+            let low = Box::new(to_expr(params[2])?);
+            let high = Box::new(to_expr(params[3])?);
             Expr::Between {
                 expr,
                 negated,
@@ -1096,17 +1095,17 @@ pub fn node_to_expr(
             }
         }
         LogicalPlanLanguage::CastExpr(params) => {
-            let expr = Box::new(to_expr(params[0].clone())?);
+            let expr = Box::new(to_expr(params[0])?);
             let data_type = match_data_node!(node_by_id, params[1], CastExprDataType);
             Expr::Cast { expr, data_type }
         }
         LogicalPlanLanguage::TryCastExpr(params) => {
-            let expr = Box::new(to_expr(params[0].clone())?);
+            let expr = Box::new(to_expr(params[0])?);
             let data_type = match_data_node!(node_by_id, params[1], TryCastExprDataType);
             Expr::TryCast { expr, data_type }
         }
         LogicalPlanLanguage::SortExpr(params) => {
-            let expr = Box::new(to_expr(params[0].clone())?);
+            let expr = Box::new(to_expr(params[0])?);
             let asc = match_data_node!(node_by_id, params[1], SortExprAsc);
             let nulls_first = match_data_node!(node_by_id, params[2], SortExprNullsFirst);
             Expr::Sort {
@@ -1188,7 +1187,7 @@ pub fn node_to_expr(
             Expr::TableUDF { fun, args }
         }
         LogicalPlanLanguage::InListExpr(params) => {
-            let expr = Box::new(to_expr(params[0].clone())?);
+            let expr = Box::new(to_expr(params[0])?);
             let list = match_expr_list_node!(node_by_id, to_expr, params[1], InListExprList);
             let negated = match_data_node!(node_by_id, params[2], InListExprNegated);
             Expr::InList {
@@ -1209,8 +1208,8 @@ pub fn node_to_expr(
             ));
         }
         LogicalPlanLanguage::InSubqueryExpr(params) => {
-            let expr = Box::new(to_expr(params[0].clone())?);
-            let subquery = Box::new(to_expr(params[1].clone())?);
+            let expr = Box::new(to_expr(params[0])?);
+            let subquery = Box::new(to_expr(params[1])?);
             let negated = match_data_node!(node_by_id, params[2], InSubqueryExprNegated);
             Expr::InSubquery {
                 expr,
@@ -1387,7 +1386,7 @@ impl LanguageToLogicalPlanConverter {
                 LogicalPlan::Join(Join {
                     left,
                     right,
-                    on: left_on.into_iter().zip_eq(right_on.into_iter()).collect(),
+                    on: left_on.into_iter().zip_eq(right_on).collect(),
                     join_type,
                     join_constraint,
                     schema,
@@ -1551,14 +1550,13 @@ impl LanguageToLogicalPlanConverter {
                                 match_data_node!(node_by_id, measure_params[0], MeasureName);
                             let expr = self.to_expr(measure_params[1])?;
                             query_measures.push(measure.to_string());
-                            let data_type = self
-                                .cube_context
-                                .meta
-                                .find_df_data_type(measure.to_string())
-                                .ok_or(CubeError::internal(format!(
-                                    "Can't find measure '{}'",
-                                    measure
-                                )))?;
+                            let data_type =
+                                self.cube_context.meta.find_df_data_type(&measure).ok_or(
+                                    CubeError::internal(format!(
+                                        "Can't find measure '{}'",
+                                        measure
+                                    )),
+                                )?;
                             fields.push((
                                 DFField::new(
                                     expr_relation(&expr),
@@ -1608,14 +1606,13 @@ impl LanguageToLogicalPlanConverter {
                         LogicalPlanLanguage::Dimension(params) => {
                             let dimension = match_data_node!(node_by_id, params[0], DimensionName);
                             let expr = self.to_expr(params[1])?;
-                            let data_type = self
-                                .cube_context
-                                .meta
-                                .find_df_data_type(dimension.to_string())
-                                .ok_or(CubeError::internal(format!(
-                                    "Can't find dimension '{}'",
-                                    dimension
-                                )))?;
+                            let data_type =
+                                self.cube_context.meta.find_df_data_type(&dimension).ok_or(
+                                    CubeError::internal(format!(
+                                        "Can't find dimension '{}'",
+                                        dimension
+                                    )),
+                                )?;
                             query_dimensions.push(dimension.to_string());
                             fields.push((
                                 DFField::new(
@@ -1705,7 +1702,7 @@ impl LanguageToLogicalPlanConverter {
                                         if self
                                             .cube_context
                                             .meta
-                                            .is_synthetic_field(column.member_name().to_string())
+                                            .is_synthetic_field(column.member_name())
                                         {
                                             fields.push((
                                                 DFField::new(
@@ -1825,16 +1822,18 @@ impl LanguageToLogicalPlanConverter {
                                 let values =
                                     match_data_node!(node_by_id, params[2], FilterMemberValues);
                                 if !is_in_or && op == "inDateRange" {
-                                    let existing_time_dimension =
-                                        query_time_dimensions.iter_mut().find_map(|td| {
+                                    let existing_time_dimensions: Vec<_> = query_time_dimensions
+                                        .iter_mut()
+                                        .filter_map(|td| {
                                             if td.dimension == member && td.date_range.is_none() {
                                                 td.date_range = Some(json!(values));
                                                 Some(td)
                                             } else {
                                                 None
                                             }
-                                        });
-                                    if existing_time_dimension.is_none() {
+                                        })
+                                        .collect();
+                                    if existing_time_dimensions.len() == 0 {
                                         let dimension = V1LoadRequestQueryTimeDimension {
                                             dimension: member.to_string(),
                                             granularity: None,
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/cost.rs b/rust/cubesql/cubesql/src/compile/rewrite/cost.rs
index b012588c37..ab22941f78 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/cost.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/cost.rs
@@ -4,7 +4,7 @@ use crate::{
     compile::rewrite::{
         rules::utils::granularity_str_to_int_order, CubeScanUngrouped, CubeScanWrapped,
         DimensionName, LogicalPlanLanguage, MemberErrorPriority, ScalarUDFExprFun,
-        TimeDimensionGranularity, WrappedSelectUngroupedScan,
+        TimeDimensionGranularity, WrappedSelectPushToCube, WrappedSelectUngroupedScan,
     },
     transport::{MetaContext, V1CubeMetaDimensionExt},
 };
@@ -143,7 +143,7 @@ impl BestCubePlan {
 
         let time_dimensions_used_as_dimensions = match enode {
             LogicalPlanLanguage::DimensionName(DimensionName(name)) => {
-                if let Some(dimension) = self.meta_context.find_dimension_with_name(name.clone()) {
+                if let Some(dimension) = self.meta_context.find_dimension_with_name(name) {
                     if dimension.is_time() {
                         1
                     } else {
@@ -189,6 +189,11 @@ impl BestCubePlan {
             _ => 0,
         };
 
+        let wrapped_select_non_push_to_cube = match enode {
+            LogicalPlanLanguage::WrappedSelectPushToCube(WrappedSelectPushToCube(false)) => 1,
+            _ => 0,
+        };
+
         let wrapped_select_ungrouped_scan = match enode {
             LogicalPlanLanguage::WrappedSelectUngroupedScan(WrappedSelectUngroupedScan(true)) => 1,
             _ => 0,
@@ -218,6 +223,7 @@ impl BestCubePlan {
             ungrouped_aggregates: 0,
             wrapper_nodes,
             joins,
+            wrapped_select_non_push_to_cube,
             wrapped_select_ungrouped_scan,
             empty_wrappers: 0,
             ast_size_outside_wrapper: 0,
@@ -243,6 +249,7 @@ impl BestCubePlan {
 /// - `member_errors` > `wrapper_nodes` - use SQL push down where possible if cube scan can't be detected
 /// - `non_pushed_down_window` > `wrapper_nodes` - prefer to always push down window functions
 /// - `non_pushed_down_limit_sort` > `wrapper_nodes` - prefer to always push down limit-sort expressions
+/// - `wrapped_select_non_push_to_cube` > `wrapped_select_ungrouped_scan` - otherwise cost would prefer any aggregation, even non-push-to-Cube
 /// - match errors by priority - optimize for more specific errors
 #[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq)]
 pub struct CubePlanCost {
@@ -260,6 +267,7 @@ pub struct CubePlanCost {
     joins: usize,
     wrapper_nodes: i64,
     ast_size_outside_wrapper: usize,
+    wrapped_select_non_push_to_cube: usize,
     wrapped_select_ungrouped_scan: usize,
     filters: i64,
     structure_points: i64,
@@ -386,6 +394,8 @@ impl CubePlanCost {
                 + other.ast_size_outside_wrapper,
             ungrouped_aggregates: self.ungrouped_aggregates + other.ungrouped_aggregates,
             wrapper_nodes: self.wrapper_nodes + other.wrapper_nodes,
+            wrapped_select_non_push_to_cube: self.wrapped_select_non_push_to_cube
+                + other.wrapped_select_non_push_to_cube,
             wrapped_select_ungrouped_scan: self.wrapped_select_ungrouped_scan
                 + other.wrapped_select_ungrouped_scan,
             cube_scan_nodes: self.cube_scan_nodes + other.cube_scan_nodes,
@@ -472,6 +482,7 @@ impl CubePlanCost {
             } + self.ungrouped_aggregates,
             unwrapped_subqueries: self.unwrapped_subqueries,
             wrapper_nodes: self.wrapper_nodes,
+            wrapped_select_non_push_to_cube: self.wrapped_select_non_push_to_cube,
             wrapped_select_ungrouped_scan: self.wrapped_select_ungrouped_scan,
             cube_scan_nodes: self.cube_scan_nodes,
             ast_size_without_alias: self.ast_size_without_alias,
@@ -712,7 +723,7 @@ where
         let mut ids = HashMap::<IdWithState<L, S>, Id>::default();
         let mut todo = node
             .children()
-            .into_iter()
+            .iter()
             .map(|id| IdWithState::new(*id, Arc::clone(&state)))
             .collect::<Vec<_>>();
 
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/mod.rs b/rust/cubesql/cubesql/src/compile/rewrite/mod.rs
index 33800d168b..57bbfa73b1 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/mod.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/mod.rs
@@ -691,7 +691,7 @@ impl LogicalPlanData {
         {
             {
                 let column_name = expr_column_name(&expr, &None);
-                let equal = name == &column_name;
+                let equal = name == column_name;
                 let _ = member_names_to_expr
                     .cached_lookups
                     .try_insert(column_name, index);
@@ -702,7 +702,7 @@ impl LogicalPlanData {
             }
             {
                 let column_name = expr_column_name_with_relation(&expr, &mut relation);
-                let equal = name == &column_name;
+                let equal = name == column_name;
                 let _ = member_names_to_expr
                     .cached_lookups
                     .try_insert(column_name, index);
@@ -1722,8 +1722,7 @@ fn case_expr<D: Display>(
             "CaseExprWhenThenExpr",
             when_then
                 .into_iter()
-                .map(|(when, then)| vec![when, then])
-                .flatten()
+                .flat_map(|(when, then)| [when, then])
                 .collect(),
         ),
         case_expr_else_expr(else_expr),
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rewriter.rs b/rust/cubesql/cubesql/src/compile/rewrite/rewriter.rs
index 331d7c57b5..a3382be317 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/rewriter.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/rewriter.rs
@@ -370,7 +370,7 @@ impl Rewriter {
                     best
                 };
                 let qtrace_best_graph = if Qtrace::is_enabled() {
-                    best.as_ref().iter().cloned().collect()
+                    best.as_ref().to_vec()
                 } else {
                     vec![]
                 };
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/filters.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/filters.rs
index bac53c2026..115a2890fb 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/rules/filters.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/rules/filters.rs
@@ -34,7 +34,7 @@ use chrono::{
         Numeric::{Day, Hour, Minute, Month, Second, Year},
         Pad::Zero,
     },
-    Datelike, Days, Duration, Months, NaiveDate, NaiveDateTime, Timelike, Weekday,
+    DateTime, Datelike, Days, Duration, Months, NaiveDate, NaiveDateTime, Timelike, Weekday,
 };
 use cubeclient::models::V1CubeMeta;
 use datafusion::{
@@ -2807,7 +2807,7 @@ impl FilterRules {
                                         ScalarValue::TimestampNanosecond(_, _)
                                         | ScalarValue::Date32(_)
                                         | ScalarValue::Date64(_) => {
-                                            if let Some(timestamp) =
+                                            if let Ok(Some(timestamp)) =
                                                 Self::scalar_to_native_datetime(&literal)
                                             {
                                                 let value = format_iso_timestamp(timestamp);
@@ -2842,7 +2842,10 @@ impl FilterRules {
                                                 continue;
                                             }
                                         }
-                                        x => panic!("Unsupported filter scalar: {:?}", x),
+                                        x => {
+                                            log::trace!("Unsupported filter scalar: {x:?}");
+                                            continue;
+                                        }
                                     };
 
                                     subst.insert(
@@ -3218,8 +3221,7 @@ impl FilterRules {
             for year in years {
                 for aliases in aliases_es.iter() {
                     if let ScalarValue::Int64(Some(year)) = year {
-                        let year = year.clone();
-                        if year < 1000 || year > 9999 {
+                        if !(1000..=9999).contains(&year) {
                             continue;
                         }
 
@@ -3442,6 +3444,7 @@ impl FilterRules {
     }
 
     // Transform ?expr IN (?literal) to ?expr = ?literal
+    // TODO it's incorrect: inner expr can be null, or can be non-literal (and domain in not clear)
     fn transform_filter_in_to_equal(
         &self,
         negated_var: &'static str,
@@ -3499,9 +3502,12 @@ impl FilterRules {
             for aliases in aliases_es {
                 if let Some(list) = &egraph[subst[list_var]].data.constant_in_list {
                     let values = list
-                        .into_iter()
+                        .iter()
                         .map(|literal| FilterRules::scalar_to_value(literal))
-                        .collect::<Vec<_>>();
+                        .collect::<Result<Vec<_>, _>>();
+                    let Ok(values) = values else {
+                        return false;
+                    };
 
                     if let Some((member_name, cube)) = Self::filter_member_name(
                         egraph,
@@ -3552,8 +3558,8 @@ impl FilterRules {
         }
     }
 
-    fn scalar_to_value(literal: &ScalarValue) -> String {
-        match literal {
+    fn scalar_to_value(literal: &ScalarValue) -> Result<String, &'static str> {
+        Ok(match literal {
             ScalarValue::Utf8(Some(value)) => value.to_string(),
             ScalarValue::Int64(Some(value)) => value.to_string(),
             ScalarValue::Boolean(Some(value)) => value.to_string(),
@@ -3564,18 +3570,24 @@ impl FilterRules {
             ScalarValue::TimestampNanosecond(_, _)
             | ScalarValue::Date32(_)
             | ScalarValue::Date64(_) => {
-                if let Some(timestamp) = Self::scalar_to_native_datetime(literal) {
-                    return format_iso_timestamp(timestamp);
+                if let Some(timestamp) = Self::scalar_to_native_datetime(literal)? {
+                    format_iso_timestamp(timestamp)
+                } else {
+                    log::trace!("Unsupported filter scalar: {literal:?}");
+                    return Err("Unsupported filter scalar");
                 }
-
-                panic!("Unsupported filter scalar: {:?}", literal);
             }
-            x => panic!("Unsupported filter scalar: {:?}", x),
-        }
+            x => {
+                log::trace!("Unsupported filter scalar: {x:?}");
+                return Err("Unsupported filter scalar");
+            }
+        })
     }
 
-    fn scalar_to_native_datetime(literal: &ScalarValue) -> Option<NaiveDateTime> {
-        match literal {
+    fn scalar_to_native_datetime(
+        literal: &ScalarValue,
+    ) -> Result<Option<NaiveDateTime>, &'static str> {
+        Ok(match literal {
             ScalarValue::TimestampNanosecond(_, _)
             | ScalarValue::Date32(_)
             | ScalarValue::Date64(_) => {
@@ -3589,13 +3601,17 @@ impl FilterRules {
                 } else if let Some(array) = array.as_any().downcast_ref::<Date64Array>() {
                     array.value_as_datetime(0)
                 } else {
-                    panic!("Unexpected array type: {:?}", array.data_type())
+                    log::trace!("Unexpected array type: {:?}", array.data_type());
+                    return Err("Unexpected array type");
                 };
 
                 timestamp
             }
-            _ => panic!("Unsupported filter scalar: {:?}", literal),
-        }
+            x => {
+                log::trace!("Unsupported filter scalar: {x:?}");
+                return Err("Unsupported filter scalar");
+            }
+        })
     }
 
     fn transform_is_null(
@@ -3713,15 +3729,15 @@ impl FilterRules {
         }
     }
 
-    fn filter_member_name(
+    fn filter_member_name<'meta>(
         egraph: &mut CubeEGraph,
         subst: &Subst,
-        meta_context: &Arc<MetaContext>,
+        meta_context: &'meta MetaContext,
         alias_to_cube_var: Var,
         column_var: Var,
         members_var: Var,
         aliases: &Vec<(String, String)>,
-    ) -> Option<(String, V1CubeMeta)> {
+    ) -> Option<(String, &'meta V1CubeMeta)> {
         Self::filter_member_name_with_granularity(
             egraph,
             subst,
@@ -3734,15 +3750,15 @@ impl FilterRules {
         .map(|(name, _, meta)| (name, meta))
     }
 
-    fn filter_member_name_with_granularity(
+    fn filter_member_name_with_granularity<'meta>(
         egraph: &mut CubeEGraph,
         subst: &Subst,
-        meta_context: &Arc<MetaContext>,
+        meta_context: &'meta MetaContext,
         alias_to_cube_var: Var,
         column_var: Var,
         members_var: Var,
         aliases: &Vec<(String, String)>,
-    ) -> Option<(String, Option<String>, V1CubeMeta)> {
+    ) -> Option<(String, Option<String>, &'meta V1CubeMeta)> {
         let alias_to_cubes: Vec<_> =
             var_iter!(egraph[subst[alias_to_cube_var]], FilterReplacerAliasToCube)
                 .cloned()
@@ -3865,10 +3881,15 @@ impl FilterRules {
                                         Some(MemberType::Time) => (),
                                         _ => continue,
                                     }
-                                    let values = vec![
-                                        FilterRules::scalar_to_value(&low),
-                                        FilterRules::scalar_to_value(&high),
-                                    ];
+
+                                    let Ok(low) = FilterRules::scalar_to_value(&low) else {
+                                        return false;
+                                    };
+                                    let Ok(high) = FilterRules::scalar_to_value(&high) else {
+                                        return false;
+                                    };
+
+                                    let values = vec![low, high];
 
                                     subst.insert(
                                         filter_member_var,
@@ -4146,7 +4167,7 @@ impl FilterRules {
     ) -> impl Fn(&mut CubeEGraph, &mut Subst) -> bool {
         let filter_ops_var = var!(filter_ops_var);
         move |egraph, subst| {
-            if let Some(true) = egraph[subst[filter_ops_var]].data.is_empty_list.clone() {
+            if let Some(true) = egraph[subst[filter_ops_var]].data.is_empty_list {
                 return true;
             }
 
@@ -4212,19 +4233,17 @@ impl FilterRules {
                         for date_range_end_op in
                             var_iter!(egraph[subst[date_range_end_op_var]], FilterMemberOp)
                         {
-                            let valid_left_filters =
-                                vec!["afterDate".to_string(), "afterOrOnDate".to_string()];
-                            let valid_right_filters =
-                                vec!["beforeDate".to_string(), "beforeOrOnDate".to_string()];
+                            let valid_left_filters = ["afterDate", "afterOrOnDate"];
+                            let valid_right_filters = ["beforeDate", "beforeOrOnDate"];
 
                             let swap_left_and_right;
 
-                            if valid_left_filters.contains(date_range_start_op)
-                                && valid_right_filters.contains(date_range_end_op)
+                            if valid_left_filters.contains(&date_range_start_op.as_str())
+                                && valid_right_filters.contains(&date_range_end_op.as_str())
                             {
                                 swap_left_and_right = false;
-                            } else if valid_left_filters.contains(date_range_end_op)
-                                && valid_right_filters.contains(date_range_start_op)
+                            } else if valid_left_filters.contains(&date_range_end_op.as_str())
+                                && valid_right_filters.contains(&date_range_start_op.as_str())
                             {
                                 swap_left_and_right = true;
                             } else {
@@ -4485,8 +4504,8 @@ impl FilterRules {
             if literals.is_empty() {
                 return false;
             }
-            for escape_char in escape_chars {
-                if let Some('!') = escape_char {
+            for escape_char in escape_chars.into_iter().flatten() {
+                if escape_char == '!' {
                     for literal in literals.iter() {
                         let literal_value = match &literal {
                             ScalarValue::Utf8(Some(literal_value)) => literal_value.to_string(),
@@ -4695,7 +4714,7 @@ impl FilterRules {
 
                 for negated in var_iter!(egraph[subst[negated_var]], InListExprNegated) {
                     let Some(values) = list
-                        .into_iter()
+                        .iter()
                         .map(|literal| Self::scalar_dt_to_naive_datetime(literal))
                         .collect::<Option<HashSet<_>>>()
                         .map(|values| {
@@ -4814,7 +4833,7 @@ impl FilterRules {
             };
             let ts_seconds = *ts / 1_000_000_000;
             let ts_nanos = (*ts % 1_000_000_000) as u32;
-            let dt = NaiveDateTime::from_timestamp_opt(ts_seconds, ts_nanos).map(|dt| Some(dt));
+            let dt = DateTime::from_timestamp(ts_seconds, ts_nanos).map(|dt| Some(dt.naive_utc()));
             return dt;
         };
 
@@ -4885,7 +4904,7 @@ impl FilterRules {
             return None;
         }
 
-        let new_dt = dt.clone();
+        let new_dt = dt;
         let new_dt = match granularity.as_str() {
             "year" => new_dt.checked_add_months(Months::new(12)),
             "quarter" | "qtr" => new_dt.checked_add_months(Months::new(3)),
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/members.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/members.rs
index d23bb3718f..68a0f8b161 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/rules/members.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/rules/members.rs
@@ -1,11 +1,11 @@
 use crate::{
     compile::rewrite::{
         agg_fun_expr, aggregate, alias_expr, all_members,
-        analysis::{ConstantFolding, LogicalPlanData, MemberNamesToExpr, OriginalExpr},
+        analysis::{ConstantFolding, LogicalPlanData, Member, MemberNamesToExpr, OriginalExpr},
         binary_expr, cast_expr, change_user_expr, column_expr, cross_join, cube_scan,
         cube_scan_filters_empty_tail, cube_scan_members, cube_scan_members_empty_tail,
-        cube_scan_order_empty_tail, dimension_expr, expr_column_name, fun_expr, join, like_expr,
-        limit, list_concat_pushdown_replacer, list_concat_pushup_replacer, literal_expr,
+        cube_scan_order_empty_tail, dimension_expr, distinct, expr_column_name, fun_expr, join,
+        like_expr, limit, list_concat_pushdown_replacer, list_concat_pushup_replacer, literal_expr,
         literal_member, measure_expr, member_pushdown_replacer, member_replacer,
         merged_members_replacer, original_expr_name, projection, referenced_columns, rewrite,
         rewriter::{CubeEGraph, CubeRewrite, RewriteRules},
@@ -262,6 +262,39 @@ impl RewriteRules for MemberRules {
                 ),
                 self.push_down_limit("?skip", "?fetch", "?new_skip", "?new_fetch"),
             ),
+            transforming_rewrite(
+                "select-distinct-dimensions",
+                distinct(cube_scan(
+                    "?alias_to_cube",
+                    "?members",
+                    "?filters",
+                    "?orders",
+                    "CubeScanLimit:None",
+                    "CubeScanOffset:None",
+                    "?split",
+                    "?can_pushdown_join",
+                    "CubeScanWrapped:false",
+                    "?left_ungrouped",
+                )),
+                cube_scan(
+                    "?alias_to_cube",
+                    "?members",
+                    "?filters",
+                    "?orders",
+                    "CubeScanLimit:None",
+                    "CubeScanOffset:None",
+                    "?split",
+                    "?can_pushdown_join",
+                    "CubeScanWrapped:false",
+                    "CubeScanUngrouped:false",
+                ),
+                self.select_distinct_dimensions(
+                    "?alias_to_cube",
+                    "?members",
+                    "?filters",
+                    "?left_ungrouped",
+                ),
+            ),
             // MOD function to binary expr
             transforming_rewrite_with_root(
                 "mod-fun-to-binary-expr",
@@ -554,38 +587,38 @@ impl MemberRules {
                 "member-pushdown-replacer-aggregate-group",
                 ListType::AggregateGroupExpr,
                 ListType::CubeScanMembers,
-                member_replacer_fn.clone(),
+                member_replacer_fn,
             ));
             rules.extend(replacer_flat_push_down_node_substitute_rules(
                 "member-pushdown-replacer-aggregate-aggr",
                 ListType::AggregateAggrExpr,
                 ListType::CubeScanMembers,
-                member_replacer_fn.clone(),
+                member_replacer_fn,
             ));
             rules.extend(replacer_flat_push_down_node_substitute_rules(
                 "member-pushdown-replacer-projection",
                 ListType::ProjectionExpr,
                 ListType::CubeScanMembers,
-                member_replacer_fn.clone(),
+                member_replacer_fn,
             ));
         } else {
             rules.extend(replacer_push_down_node_substitute_rules(
                 "member-pushdown-replacer-aggregate-group",
                 "AggregateGroupExpr",
                 "CubeScanMembers",
-                member_replacer_fn.clone(),
+                member_replacer_fn,
             ));
             rules.extend(replacer_push_down_node_substitute_rules(
                 "member-pushdown-replacer-aggregate-aggr",
                 "AggregateAggrExpr",
                 "CubeScanMembers",
-                member_replacer_fn.clone(),
+                member_replacer_fn,
             ));
             rules.extend(replacer_push_down_node_substitute_rules(
                 "member-pushdown-replacer-projection",
                 "ProjectionExpr",
                 "CubeScanMembers",
-                member_replacer_fn.clone(),
+                member_replacer_fn,
             ));
         }
         rules.extend(find_matching_old_member("column", column_expr("?column")));
@@ -1383,7 +1416,7 @@ impl MemberRules {
                     if !aliases_to_cube.is_empty() && !projection_aliases.is_empty() {
                         // TODO: We could, more generally, cache referenced_columns(referenced_expr), which calls expr_column_name.
                         let mut columns = HashSet::new();
-                        columns.extend(referenced_columns(referenced_expr).into_iter());
+                        columns.extend(referenced_columns(referenced_expr));
 
                         for alias_to_cube in aliases_to_cube {
                             for projection_alias in &projection_aliases {
@@ -1409,7 +1442,7 @@ impl MemberRules {
                                         egraph.add(LogicalPlanLanguage::CubeScanAliasToCube(
                                             CubeScanAliasToCube(replaced_alias_to_cube.clone()),
                                         ));
-                                    subst.insert(new_alias_to_cube_var, new_alias_to_cube.clone());
+                                    subst.insert(new_alias_to_cube_var, new_alias_to_cube);
 
                                     let member_pushdown_replacer_alias_to_cube = egraph.add(
                                         LogicalPlanLanguage::MemberPushdownReplacerAliasToCube(
@@ -1478,6 +1511,70 @@ impl MemberRules {
             )
     }
 
+    fn select_distinct_dimensions(
+        &self,
+        alias_to_cube_var: &'static str,
+        members_var: &'static str,
+        filters_var: &'static str,
+        left_ungrouped_var: &'static str,
+    ) -> impl Fn(&mut CubeEGraph, &mut Subst) -> bool {
+        let alias_to_cube_var = var!(alias_to_cube_var);
+        let members_var = var!(members_var);
+        let filters_var = var!(filters_var);
+        let left_ungrouped_var = var!(left_ungrouped_var);
+        let meta_context = self.meta_context.clone();
+
+        move |egraph, subst| {
+            let empty_filters = &egraph[subst[filters_var]]
+                .data
+                .is_empty_list
+                .unwrap_or(true);
+            let ungrouped =
+                var_iter!(egraph[subst[left_ungrouped_var]], CubeScanUngrouped).any(|v| *v);
+
+            if !empty_filters && ungrouped {
+                return false;
+            }
+
+            let res = match egraph
+                .index(subst[members_var])
+                .data
+                .member_name_to_expr
+                .as_ref()
+            {
+                Some(names_to_expr) => {
+                    names_to_expr.list.iter().all(|(_, member, _)| {
+                        // we should allow transform for queries with dimensions only,
+                        // as it doesn't make sense for measures
+                        match member {
+                            Member::Dimension { .. } => true,
+                            Member::VirtualField { .. } => true,
+                            Member::LiteralMember { .. } => true,
+                            _ => false,
+                        }
+                    })
+                }
+                None => {
+                    // this might be the case of `SELECT DISTINCT *`
+                    // we need to check that there are only dimensions defined in the referenced cube(s)
+                    var_iter!(egraph[subst[alias_to_cube_var]], CubeScanAliasToCube)
+                        .cloned()
+                        .all(|alias_to_cube| {
+                            alias_to_cube.iter().all(|(_, cube_name)| {
+                                if let Some(cube) = meta_context.find_cube_with_name(&cube_name) {
+                                    cube.measures.len() == 0 && cube.segments.len() == 0
+                                } else {
+                                    false
+                                }
+                            })
+                        })
+                }
+            };
+
+            res
+        }
+    }
+
     fn push_down_non_empty_aggregate(
         &self,
         alias_to_cube_var: &'static str,
@@ -1536,8 +1633,8 @@ impl MemberRules {
             }
 
             let mut columns = HashSet::new();
-            columns.extend(referenced_columns(referenced_group_expr).into_iter());
-            columns.extend(referenced_columns(referenced_aggr_expr).into_iter());
+            columns.extend(referenced_columns(referenced_group_expr));
+            columns.extend(referenced_columns(referenced_aggr_expr));
 
             let new_pushdown_join = referenced_aggr_expr.is_empty();
 
@@ -1916,7 +2013,7 @@ impl MemberRules {
             .cloned()
             {
                 // alias_to_cube at this point is already filtered to a single cube
-                let cube_alias = alias_to_cube.iter().next().unwrap().0 .1.to_string();
+                let cube_alias = alias_to_cube.first().unwrap().0 .1.to_string();
                 for cube in var_iter!(egraph[subst[cube_var]], AllMembersCube).cloned() {
                     let column_iter = if default_count {
                         vec![Column::from_name(Self::default_count_measure_name())]
@@ -2069,7 +2166,7 @@ impl MemberRules {
                             .cloned()
                             {
                                 if let Some(measure) =
-                                    meta_context.find_measure_with_name(measure_name.to_string())
+                                    meta_context.find_measure_with_name(&measure_name)
                                 {
                                     let measure_cube_name = measure_name.split(".").next().unwrap();
                                     if let Some(((_, cube_alias), _)) = alias_to_cube
@@ -2108,7 +2205,7 @@ impl MemberRules {
                                 }
 
                                 if let Some(dimension) =
-                                    meta_context.find_dimension_with_name(measure_name.to_string())
+                                    meta_context.find_dimension_with_name(&measure_name)
                                 {
                                     let alias_to_cube = alias_to_cube.clone();
                                     subst.insert(
@@ -2212,7 +2309,7 @@ impl MemberRules {
                                                 call_agg_type,
                                                 alias,
                                                 measure_out_var,
-                                                cube_alias,
+                                                cube_alias.to_string(),
                                                 subst[aggr_expr_var],
                                                 alias_to_cube,
                                                 disable_strict_agg_type_match,
@@ -2319,7 +2416,7 @@ impl MemberRules {
             {
                 for column in var_iter!(egraph[subst[column_var]], ColumnExprColumn).cloned() {
                     // alias_to_cube at this point is already filtered to a single cube
-                    let alias = alias_to_cube.iter().next().unwrap().0 .1.to_string();
+                    let alias = alias_to_cube.first().unwrap().0 .1.to_string();
                     let alias_expr = Self::add_alias_column(
                         egraph,
                         column.name.to_string(),
@@ -2422,7 +2519,7 @@ impl MemberRules {
             {
                 for alias in var_iter!(egraph[subst[alias_var]], AliasExprAlias).cloned() {
                     // alias_to_cube at this point is already filtered to a single cube
-                    let cube_alias = alias_to_cube.iter().next().unwrap().0 .1.to_string();
+                    let cube_alias = alias_to_cube.first().unwrap().0 .1.to_string();
                     let alias_expr =
                         Self::add_alias_column(egraph, alias.to_string(), Some(cube_alias.clone()));
                     subst.insert(output_column_var, alias_expr);
@@ -2625,11 +2722,11 @@ impl MemberRules {
                                 continue;
                             }
 
-                            let is_left_order_empty = Some(true)
-                                == egraph[subst[left_order_var]].data.is_empty_list.clone();
+                            let is_left_order_empty =
+                                Some(true) == egraph[subst[left_order_var]].data.is_empty_list;
 
-                            let is_right_order_empty = Some(true)
-                                == egraph[subst[right_order_var]].data.is_empty_list.clone();
+                            let is_right_order_empty =
+                                Some(true) == egraph[subst[right_order_var]].data.is_empty_list;
 
                             if !is_left_order_empty && !is_right_order_empty {
                                 continue;
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/old_split.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/old_split.rs
index b79d5325f8..e784fe33f9 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/rules/old_split.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/rules/old_split.rs
@@ -4326,298 +4326,261 @@ impl RewriteRules for OldSplitRules {
 
         // Combinator rules
         // Column
-        rules.extend(
-            self.outer_aggr_group_expr_aggr_combinator_rewrite(
-                "split-push-down-column-replacer",
-                |split_replacer| split_replacer(column_expr("?column"), "?cube"),
-                |_| vec![],
-                |_| column_expr("?column"),
-                |_, _| true,
-                false,
-                true,
-                true,
-                None,
-            )
-            .into_iter(),
-        );
+        rules.extend(self.outer_aggr_group_expr_aggr_combinator_rewrite(
+            "split-push-down-column-replacer",
+            |split_replacer| split_replacer(column_expr("?column"), "?cube"),
+            |_| vec![],
+            |_| column_expr("?column"),
+            |_, _| true,
+            false,
+            true,
+            true,
+            None,
+        ));
         // DateTrunc
-        rules.extend(
-            self.outer_aggr_group_expr_aggr_combinator_rewrite(
-                "split-push-down-date-trunc-replacer",
-                |split_replacer| split_replacer("?expr", "?cube"),
-                |_| {
-                    vec![(
-                        "?expr",
-                        self.fun_expr(
-                            "DateTrunc",
-                            vec![literal_expr("?granularity"), column_expr("?column")],
-                        ),
-                    )]
-                },
-                |_| "?alias".to_string(),
-                self.transform_original_expr_alias(
-                    |egraph, id| {
-                        var_iter!(egraph[id], OuterAggregateSplitReplacerAliasToCube)
-                            .cloned()
-                            .chain(
-                                var_iter!(egraph[id], OuterProjectionSplitReplacerAliasToCube)
-                                    .cloned(),
-                            )
-                            .chain(
-                                var_iter!(egraph[id], GroupExprSplitReplacerAliasToCube).cloned(),
-                            )
-                            .chain(
-                                var_iter!(egraph[id], GroupAggregateSplitReplacerAliasToCube)
-                                    .cloned(),
-                            )
-                            .collect()
-                    },
+        rules.extend(self.outer_aggr_group_expr_aggr_combinator_rewrite(
+            "split-push-down-date-trunc-replacer",
+            |split_replacer| split_replacer("?expr", "?cube"),
+            |_| {
+                vec![(
                     "?expr",
-                    "?column",
-                    "?cube",
-                    "?alias",
-                ),
-                true,
-                true,
-                true,
-                None,
-            )
-            .into_iter(),
-        );
-        // DatePart
-        rules.extend(
-            self.outer_aggr_group_expr_aggr_combinator_rewrite(
-                "split-push-down-date-part-replacer",
-                |split_replacer| {
-                    split_replacer(
-                        self.fun_expr(
-                            "DatePart",
-                            vec![literal_expr("?granularity"), "?expr".to_string()],
-                        ),
-                        "?cube",
-                    )
+                    self.fun_expr(
+                        "DateTrunc",
+                        vec![literal_expr("?granularity"), column_expr("?column")],
+                    ),
+                )]
+            },
+            |_| "?alias".to_string(),
+            self.transform_original_expr_alias(
+                |egraph, id| {
+                    var_iter!(egraph[id], OuterAggregateSplitReplacerAliasToCube)
+                        .cloned()
+                        .chain(
+                            var_iter!(egraph[id], OuterProjectionSplitReplacerAliasToCube).cloned(),
+                        )
+                        .chain(var_iter!(egraph[id], GroupExprSplitReplacerAliasToCube).cloned())
+                        .chain(
+                            var_iter!(egraph[id], GroupAggregateSplitReplacerAliasToCube).cloned(),
+                        )
+                        .collect()
                 },
-                |_| vec![("?expr", column_expr("?column"))],
-                |_| {
+                "?expr",
+                "?column",
+                "?cube",
+                "?alias",
+            ),
+            true,
+            true,
+            true,
+            None,
+        ));
+        // DatePart
+        rules.extend(self.outer_aggr_group_expr_aggr_combinator_rewrite(
+            "split-push-down-date-part-replacer",
+            |split_replacer| {
+                split_replacer(
                     self.fun_expr(
                         "DatePart",
-                        vec![
-                            literal_expr("?granularity"),
-                            alias_expr("?alias_column", "?alias"),
-                        ],
-                    )
-                },
-                MemberRules::transform_original_expr_date_trunc(
-                    "?expr",
-                    "?granularity",
-                    "?granularity",
-                    "?alias_column",
-                    Some("?alias"),
-                    false,
-                ),
+                        vec![literal_expr("?granularity"), "?expr".to_string()],
+                    ),
+                    "?cube",
+                )
+            },
+            |_| vec![("?expr", column_expr("?column"))],
+            |_| {
+                self.fun_expr(
+                    "DatePart",
+                    vec![
+                        literal_expr("?granularity"),
+                        alias_expr("?alias_column", "?alias"),
+                    ],
+                )
+            },
+            MemberRules::transform_original_expr_date_trunc(
+                "?expr",
+                "?granularity",
+                "?granularity",
+                "?alias_column",
+                Some("?alias"),
                 false,
-                true,
-                true,
-                None,
-            )
-            .into_iter(),
-        );
+            ),
+            false,
+            true,
+            true,
+            None,
+        ));
         // Substr
-        rules.extend(
-            self.outer_aggr_group_expr_aggr_combinator_rewrite(
-                "split-push-down-substr-replacer",
-                |split_replacer| {
-                    split_replacer(
-                        self.fun_expr("Substr", vec!["?expr", "?from", "?to"]),
-                        "?cube",
-                    )
-                },
-                |_| vec![],
-                |split_replacer| {
-                    self.fun_expr(
-                        "Substr",
-                        vec![
-                            split_replacer("?expr".to_string(), "?cube"),
-                            "?from".to_string(),
-                            "?to".to_string(),
-                        ],
-                    )
-                },
-                |_, _| true,
-                false,
-                false,
-                true,
-                Some(vec![("?expr", column_expr("?column"))]),
-            )
-            .into_iter(),
-        );
+        rules.extend(self.outer_aggr_group_expr_aggr_combinator_rewrite(
+            "split-push-down-substr-replacer",
+            |split_replacer| {
+                split_replacer(
+                    self.fun_expr("Substr", vec!["?expr", "?from", "?to"]),
+                    "?cube",
+                )
+            },
+            |_| vec![],
+            |split_replacer| {
+                self.fun_expr(
+                    "Substr",
+                    vec![
+                        split_replacer("?expr".to_string(), "?cube"),
+                        "?from".to_string(),
+                        "?to".to_string(),
+                    ],
+                )
+            },
+            |_, _| true,
+            false,
+            false,
+            true,
+            Some(vec![("?expr", column_expr("?column"))]),
+        ));
         // CharacterLength
-        rules.extend(
-            self.outer_aggr_group_expr_aggr_combinator_rewrite(
-                "split-push-down-char-length-replacer",
-                |split_replacer| {
-                    split_replacer(self.fun_expr("CharacterLength", vec!["?expr"]), "?cube")
-                },
-                |_| vec![],
-                |split_replacer| {
-                    self.fun_expr(
-                        "CharacterLength",
-                        vec![split_replacer("?expr".to_string(), "?cube")],
-                    )
-                },
-                |_, _| true,
-                false,
-                false,
-                true,
-                Some(vec![("?expr", column_expr("?column"))]),
-            )
-            .into_iter(),
-        );
+        rules.extend(self.outer_aggr_group_expr_aggr_combinator_rewrite(
+            "split-push-down-char-length-replacer",
+            |split_replacer| {
+                split_replacer(self.fun_expr("CharacterLength", vec!["?expr"]), "?cube")
+            },
+            |_| vec![],
+            |split_replacer| {
+                self.fun_expr(
+                    "CharacterLength",
+                    vec![split_replacer("?expr".to_string(), "?cube")],
+                )
+            },
+            |_, _| true,
+            false,
+            false,
+            true,
+            Some(vec![("?expr", column_expr("?column"))]),
+        ));
         // Left
-        rules.extend(
-            self.outer_aggr_group_expr_aggr_combinator_rewrite(
-                "split-push-down-left-replacer",
-                |split_replacer| {
-                    split_replacer(
-                        self.fun_expr("Left", vec!["?expr".to_string(), literal_expr("?length")]),
-                        "?cube",
-                    )
-                },
-                |_| vec![],
-                |split_replacer| {
-                    self.fun_expr(
-                        "Left",
-                        vec![
-                            split_replacer("?expr".to_string(), "?cube"),
-                            literal_expr("?length"),
-                        ],
-                    )
-                },
-                |_, _| true,
-                false,
-                false,
-                true,
-                Some(vec![("?expr", column_expr("?column"))]),
-            )
-            .into_iter(),
-        );
+        rules.extend(self.outer_aggr_group_expr_aggr_combinator_rewrite(
+            "split-push-down-left-replacer",
+            |split_replacer| {
+                split_replacer(
+                    self.fun_expr("Left", vec!["?expr".to_string(), literal_expr("?length")]),
+                    "?cube",
+                )
+            },
+            |_| vec![],
+            |split_replacer| {
+                self.fun_expr(
+                    "Left",
+                    vec![
+                        split_replacer("?expr".to_string(), "?cube"),
+                        literal_expr("?length"),
+                    ],
+                )
+            },
+            |_, _| true,
+            false,
+            false,
+            true,
+            Some(vec![("?expr", column_expr("?column"))]),
+        ));
         // Right
-        rules.extend(
-            self.outer_aggr_group_expr_aggr_combinator_rewrite(
-                "split-push-down-right-replacer",
-                |split_replacer| {
-                    split_replacer(
-                        self.fun_expr("Right", vec!["?expr".to_string(), literal_expr("?length")]),
-                        "?cube",
-                    )
-                },
-                |_| vec![],
-                |split_replacer| {
-                    self.fun_expr(
-                        "Right",
-                        vec![
-                            split_replacer("?expr".to_string(), "?cube"),
-                            literal_expr("?length"),
-                        ],
-                    )
-                },
-                |_, _| true,
-                false,
-                false,
-                true,
-                Some(vec![("?expr", column_expr("?column"))]),
-            )
-            .into_iter(),
-        );
+        rules.extend(self.outer_aggr_group_expr_aggr_combinator_rewrite(
+            "split-push-down-right-replacer",
+            |split_replacer| {
+                split_replacer(
+                    self.fun_expr("Right", vec!["?expr".to_string(), literal_expr("?length")]),
+                    "?cube",
+                )
+            },
+            |_| vec![],
+            |split_replacer| {
+                self.fun_expr(
+                    "Right",
+                    vec![
+                        split_replacer("?expr".to_string(), "?cube"),
+                        literal_expr("?length"),
+                    ],
+                )
+            },
+            |_, _| true,
+            false,
+            false,
+            true,
+            Some(vec![("?expr", column_expr("?column"))]),
+        ));
         // to_char
-        rules.extend(
-            self.outer_aggr_group_expr_aggr_combinator_rewrite(
-                "split-push-down-to-char-replacer",
-                |split_replacer| {
-                    split_replacer(
-                        udf_expr(
-                            "to_char",
-                            vec!["?expr".to_string(), literal_expr("?format")],
-                        ),
-                        "?cube",
-                    )
-                },
-                |_| vec![],
-                |split_replacer| {
+        rules.extend(self.outer_aggr_group_expr_aggr_combinator_rewrite(
+            "split-push-down-to-char-replacer",
+            |split_replacer| {
+                split_replacer(
                     udf_expr(
                         "to_char",
-                        vec![
-                            split_replacer("?expr".to_string(), "?cube"),
-                            literal_expr("?format"),
-                        ],
-                    )
-                },
-                |_, _| true,
-                false,
-                false,
-                true,
-                Some(vec![("?expr", column_expr("?column"))]),
-            )
-            .into_iter(),
-        );
+                        vec!["?expr".to_string(), literal_expr("?format")],
+                    ),
+                    "?cube",
+                )
+            },
+            |_| vec![],
+            |split_replacer| {
+                udf_expr(
+                    "to_char",
+                    vec![
+                        split_replacer("?expr".to_string(), "?cube"),
+                        literal_expr("?format"),
+                    ],
+                )
+            },
+            |_, _| true,
+            false,
+            false,
+            true,
+            Some(vec![("?expr", column_expr("?column"))]),
+        ));
         // NullIf
-        rules.extend(
-            self.outer_aggr_group_expr_aggr_combinator_rewrite(
-                "split-push-down-nullif-replacer",
-                |split_replacer| {
-                    split_replacer(
-                        self.fun_expr("NullIf", vec!["?expr".to_string(), literal_expr("?else")]),
-                        "?cube",
-                    )
-                },
-                |_| vec![],
-                |split_replacer| {
-                    self.fun_expr(
-                        "NullIf",
-                        vec![
-                            split_replacer("?expr".to_string(), "?cube"),
-                            literal_expr("?else"),
-                        ],
-                    )
-                },
-                |_, _| true,
-                false,
-                true,
-                true,
-                Some(vec![("?expr", column_expr("?column"))]),
-            )
-            .into_iter(),
-        );
+        rules.extend(self.outer_aggr_group_expr_aggr_combinator_rewrite(
+            "split-push-down-nullif-replacer",
+            |split_replacer| {
+                split_replacer(
+                    self.fun_expr("NullIf", vec!["?expr".to_string(), literal_expr("?else")]),
+                    "?cube",
+                )
+            },
+            |_| vec![],
+            |split_replacer| {
+                self.fun_expr(
+                    "NullIf",
+                    vec![
+                        split_replacer("?expr".to_string(), "?cube"),
+                        literal_expr("?else"),
+                    ],
+                )
+            },
+            |_, _| true,
+            false,
+            true,
+            true,
+            Some(vec![("?expr", column_expr("?column"))]),
+        ));
         // IS NULL
-        rules.extend(
-            self.outer_aggr_group_expr_aggr_combinator_rewrite(
-                "split-push-down-is-null-replacer",
-                |split_replacer| split_replacer(is_null_expr("?expr"), "?cube"),
-                |_| vec![],
-                |split_replacer| is_null_expr(split_replacer("?expr".to_string(), "?cube")),
-                |_, _| true,
-                false,
-                true,
-                true,
-                Some(vec![("?expr", column_expr("?column"))]),
-            )
-            .into_iter(),
-        );
+        rules.extend(self.outer_aggr_group_expr_aggr_combinator_rewrite(
+            "split-push-down-is-null-replacer",
+            |split_replacer| split_replacer(is_null_expr("?expr"), "?cube"),
+            |_| vec![],
+            |split_replacer| is_null_expr(split_replacer("?expr".to_string(), "?cube")),
+            |_, _| true,
+            false,
+            true,
+            true,
+            Some(vec![("?expr", column_expr("?column"))]),
+        ));
         // IS NOT NULL
-        rules.extend(
-            self.outer_aggr_group_expr_aggr_combinator_rewrite(
-                "split-push-down-is-not-null-replacer",
-                |split_replacer| split_replacer(is_not_null_expr("?expr"), "?cube"),
-                |_| vec![],
-                |split_replacer| is_not_null_expr(split_replacer("?expr".to_string(), "?cube")),
-                |_, _| true,
-                false,
-                true,
-                true,
-                Some(vec![("?expr", column_expr("?column"))]),
-            )
-            .into_iter(),
-        );
+        rules.extend(self.outer_aggr_group_expr_aggr_combinator_rewrite(
+            "split-push-down-is-not-null-replacer",
+            |split_replacer| split_replacer(is_not_null_expr("?expr"), "?cube"),
+            |_| vec![],
+            |split_replacer| is_not_null_expr(split_replacer("?expr".to_string(), "?cube")),
+            |_, _| true,
+            false,
+            true,
+            true,
+            Some(vec![("?expr", column_expr("?column"))]),
+        ));
 
         rules
     }
@@ -4683,135 +4646,112 @@ impl OldSplitRules {
         )];
 
         if outer_projection {
-            rules.extend(
-                vec![transforming_chain_rewrite(
-                    &format!("{}-outer-projection", base_name),
-                    main_searcher(outer_projection_split_replacer),
-                    chain(outer_projection_split_replacer),
-                    applier(outer_projection_split_replacer),
-                    transform_fn.clone(),
-                )]
-                .into_iter(),
-            );
+            rules.extend(vec![transforming_chain_rewrite(
+                &format!("{}-outer-projection", base_name),
+                main_searcher(outer_projection_split_replacer),
+                chain(outer_projection_split_replacer),
+                applier(outer_projection_split_replacer),
+                transform_fn.clone(),
+            )]);
         }
 
         let unwrap_expr = unwrap_agg_chain.is_some();
         let column_subst = if unwrap_expr { None } else { Some("?column") };
 
         if is_measure {
-            rules.extend(
-                vec![
-                    // Group expr -- skip measures
-                    transforming_chain_rewrite(
-                        &format!("{}-group-expr-measure", base_name),
-                        main_searcher(group_expr_split_replacer),
-                        chain(group_expr_split_replacer),
-                        if unwrap_expr {
-                            applier(group_expr_split_replacer)
-                        } else {
-                            aggr_group_expr_empty_tail()
-                        },
-                        self.transform_group_expr_measure(
-                            "?cube",
-                            column_subst,
-                            transform_fn.clone(),
-                        ),
-                    ),
-                    // Group aggr -- keep & wrap measures
-                    transforming_chain_rewrite(
-                        &format!("{}-group-aggr-measure", base_name),
-                        main_searcher(group_aggregate_split_replacer),
-                        chain(group_aggregate_split_replacer),
+            rules.extend(vec![
+                // Group expr -- skip measures
+                transforming_chain_rewrite(
+                    &format!("{}-group-expr-measure", base_name),
+                    main_searcher(group_expr_split_replacer),
+                    chain(group_expr_split_replacer),
+                    if unwrap_expr {
+                        applier(group_expr_split_replacer)
+                    } else {
+                        aggr_group_expr_empty_tail()
+                    },
+                    self.transform_group_expr_measure("?cube", column_subst, transform_fn.clone()),
+                ),
+                // Group aggr -- keep & wrap measures
+                transforming_chain_rewrite(
+                    &format!("{}-group-aggr-measure", base_name),
+                    main_searcher(group_aggregate_split_replacer),
+                    chain(group_aggregate_split_replacer),
+                    if unwrap_expr {
+                        applier(group_aggregate_split_replacer)
+                    } else {
+                        agg_fun_expr(
+                            "?output_fun",
+                            vec![applier(group_aggregate_split_replacer)],
+                            "?distinct",
+                        )
+                    },
+                    self.transform_group_aggregate_measure(
+                        "?cube",
+                        column_subst,
                         if unwrap_expr {
-                            applier(group_aggregate_split_replacer)
+                            None
                         } else {
-                            agg_fun_expr(
-                                "?output_fun",
-                                vec![applier(group_aggregate_split_replacer)],
-                                "?distinct",
-                            )
+                            Some("?output_fun")
                         },
-                        self.transform_group_aggregate_measure(
-                            "?cube",
-                            column_subst,
-                            if unwrap_expr {
-                                None
-                            } else {
-                                Some("?output_fun")
-                            },
-                            if unwrap_expr { None } else { Some("?distinct") },
-                            transform_fn.clone(),
-                        ),
+                        if unwrap_expr { None } else { Some("?distinct") },
+                        transform_fn.clone(),
                     ),
-                ]
-                .into_iter(),
-            );
+                ),
+            ]);
 
             if let Some(unwrap_agg_chain) = unwrap_agg_chain {
-                rules.extend(
-                    vec![
-                        rewrite(
-                            &format!("{}-unwrap-group-expr-empty-tail", base_name),
-                            applier(|_, _| aggr_group_expr_empty_tail()),
-                            aggr_group_expr_empty_tail(),
-                        ),
-                        transforming_chain_rewrite(
-                            &format!("{}-unwrap-group-aggr-agg-fun", base_name),
-                            applier(|expr, _| agg_fun_expr("?output_fun", vec![expr], "?distinct")),
-                            unwrap_agg_chain,
-                            agg_fun_expr("?output_fun", vec![column_expr("?column")], "?distinct"),
-                            |_, _| true,
-                        ),
-                    ]
-                    .into_iter(),
-                );
+                rules.extend(vec![
+                    rewrite(
+                        &format!("{}-unwrap-group-expr-empty-tail", base_name),
+                        applier(|_, _| aggr_group_expr_empty_tail()),
+                        aggr_group_expr_empty_tail(),
+                    ),
+                    transforming_chain_rewrite(
+                        &format!("{}-unwrap-group-aggr-agg-fun", base_name),
+                        applier(|expr, _| agg_fun_expr("?output_fun", vec![expr], "?distinct")),
+                        unwrap_agg_chain,
+                        agg_fun_expr("?output_fun", vec![column_expr("?column")], "?distinct"),
+                        |_, _| true,
+                    ),
+                ]);
             }
         }
 
         if is_dimension {
-            rules.extend(
-                vec![
-                    // Group expr -- keep dimensions
-                    transforming_chain_rewrite(
-                        &format!("{}-group-expr-dimension", base_name),
-                        main_searcher(group_expr_split_replacer),
-                        chain(group_expr_split_replacer),
-                        applier(group_expr_split_replacer),
-                        self.transform_group_expr_dimension(
-                            "?cube",
-                            column_subst,
-                            transform_fn.clone(),
-                        ),
-                    ),
-                    // Group aggr -- skip dimensions
-                    transforming_chain_rewrite(
-                        &format!("{}-group-aggr-dimension", base_name),
-                        main_searcher(group_aggregate_split_replacer),
-                        chain(group_aggregate_split_replacer),
-                        if unwrap_expr {
-                            applier(group_aggregate_split_replacer)
-                        } else {
-                            aggr_aggr_expr_empty_tail()
-                        },
-                        self.transform_group_aggregate_dimension(
-                            "?cube",
-                            column_subst,
-                            transform_fn,
-                        ),
-                    ),
-                ]
-                .into_iter(),
-            );
+            rules.extend(vec![
+                // Group expr -- keep dimensions
+                transforming_chain_rewrite(
+                    &format!("{}-group-expr-dimension", base_name),
+                    main_searcher(group_expr_split_replacer),
+                    chain(group_expr_split_replacer),
+                    applier(group_expr_split_replacer),
+                    self.transform_group_expr_dimension(
+                        "?cube",
+                        column_subst,
+                        transform_fn.clone(),
+                    ),
+                ),
+                // Group aggr -- skip dimensions
+                transforming_chain_rewrite(
+                    &format!("{}-group-aggr-dimension", base_name),
+                    main_searcher(group_aggregate_split_replacer),
+                    chain(group_aggregate_split_replacer),
+                    if unwrap_expr {
+                        applier(group_aggregate_split_replacer)
+                    } else {
+                        aggr_aggr_expr_empty_tail()
+                    },
+                    self.transform_group_aggregate_dimension("?cube", column_subst, transform_fn),
+                ),
+            ]);
 
             if unwrap_expr {
-                rules.extend(
-                    vec![rewrite(
-                        &format!("{}-unwrap-group-aggr-empty-tail", base_name),
-                        applier(|_, _| aggr_aggr_expr_empty_tail()),
-                        aggr_aggr_expr_empty_tail(),
-                    )]
-                    .into_iter(),
-                );
+                rules.extend(vec![rewrite(
+                    &format!("{}-unwrap-group-aggr-empty-tail", base_name),
+                    applier(|_, _| aggr_aggr_expr_empty_tail()),
+                    aggr_aggr_expr_empty_tail(),
+                )]);
             }
         }
 
@@ -4922,7 +4862,7 @@ impl OldSplitRules {
                             // TODO unwrap
                             let name = expr.name(&DFSchema::empty()).unwrap();
                             let column1 = Column {
-                                relation: Some(alias),
+                                relation: Some(alias.to_string()),
                                 name: name.to_string(),
                             };
                             let alias = egraph.add(LogicalPlanLanguage::ColumnExprColumn(
@@ -5624,7 +5564,8 @@ impl OldSplitRules {
                     Some(0) | Some(1)
                 ) {
                     continue;
-                } else if matches!(
+                }
+                if matches!(
                     aggr_expr_var
                         .and_then(|v| egraph[subst[v]].data.trivial_push_down)
                         .zip(group_expr_var.and_then(|v| egraph[subst[v]].data.trivial_push_down))
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/split/mod.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/split/mod.rs
index 2bbb2c7d13..686653a8e4 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/rules/split/mod.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/rules/split/mod.rs
@@ -333,7 +333,7 @@ impl SplitRules {
                     let inner_alias = egraph.add(LogicalPlanLanguage::AliasExprAlias(
                         AliasExprAlias(original_expr.to_string()),
                     ));
-                    subst.insert(inner_alias_var, inner_alias.clone());
+                    subst.insert(inner_alias_var, inner_alias);
 
                     let outer_alias_column =
                         MemberRules::add_alias_column(egraph, original_expr, None);
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/split/top_level.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/split/top_level.rs
index a040c6dc21..a453baab31 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/rules/split/top_level.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/rules/split/top_level.rs
@@ -359,7 +359,8 @@ impl SplitRules {
                 Some(0) | Some(1)
             ) {
                 return false;
-            } else if matches!(
+            }
+            if matches!(
                 aggr_expr_var
                     .and_then(|v| egraph[subst[v]].data.trivial_push_down)
                     .zip(group_expr_var.and_then(|v| egraph[subst[v]].data.trivial_push_down))
@@ -491,7 +492,7 @@ impl SplitRules {
             let projection_expr = group_expr_node
                 .iter()
                 .chain(aggr_expr_node.iter())
-                .map(|id| *id)
+                .copied()
                 .collect::<Vec<_>>();
             subst.insert(
                 projection_expr_var,
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/utils.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/utils.rs
index a941bc7cdc..66eed50dc2 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/rules/utils.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/rules/utils.rs
@@ -4,7 +4,7 @@ use std::{
     sync::Arc,
 };
 
-use chrono::{Datelike, NaiveDateTime, Timelike};
+use chrono::{DateTime, Datelike, Timelike, Utc};
 use datafusion::{
     arrow::datatypes::{ArrowPrimitiveType, IntervalDayTimeType, IntervalMonthDayNanoType},
     error::DataFusionError,
@@ -457,9 +457,9 @@ pub fn is_literal_date_trunced(ns: i64, granularity: &str) -> Option<bool> {
         return Some(false);
     }
     let seconds = ns / ns_in_seconds;
-    let dt = NaiveDateTime::from_timestamp_opt(seconds, 0)?;
+    let dt = DateTime::from_timestamp(seconds, 0)?;
 
-    let is_minute_trunced = |dt: NaiveDateTime| dt.second() == 0;
+    let is_minute_trunced = |dt: DateTime<Utc>| dt.second() == 0;
     let is_hour_trunced = |dt| is_minute_trunced(dt) && dt.minute() == 0;
     let is_day_trunced = |dt| is_hour_trunced(dt) && dt.hour() == 0;
     let is_week_trunced = |dt| is_day_trunced(dt) && dt.weekday().num_days_from_monday() == 0;
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/aggregate.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/aggregate.rs
index d1cff7bfc5..63155c173f 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/aggregate.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/aggregate.rs
@@ -878,9 +878,7 @@ impl WrapperRules {
                                         &column.name,
                                     )
                                 {
-                                    if let Some(measure) =
-                                        meta.find_measure_with_name(member.to_string())
-                                    {
+                                    if let Some(measure) = meta.find_measure_with_name(member) {
                                         if call_agg_type.is_none()
                                             || measure.is_same_agg_type(
                                                 call_agg_type.as_ref().unwrap(),
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/column.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/column.rs
index a3ce49c8b9..1b19e8da99 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/column.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/column.rs
@@ -214,7 +214,7 @@ impl WrapperRules {
                     .data
                     .find_member_by_alias(&column.name)
                 {
-                    if let Some(measure) = meta.find_measure_with_name(member.to_string()) {
+                    if let Some(measure) = meta.find_measure_with_name(member) {
                         if measure.agg_type != Some("number".to_string()) {
                             return true;
                         }
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/join.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/join.rs
index 1332139a72..eab7a0d1a4 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/join.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/join.rs
@@ -679,7 +679,7 @@ impl WrapperRules {
     ) -> Option<Id> {
         let join_on_pairs = left_join_on
             .into_iter()
-            .zip(right_join_on.into_iter())
+            .zip(right_join_on)
             .collect::<Vec<_>>();
 
         let result_expr =
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/mod.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/mod.rs
index e729e21217..e231f97d33 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/mod.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/mod.rs
@@ -60,6 +60,7 @@ impl RewriteRules for WrapperRules {
         self.aggregate_merge_rules(&mut rules);
         self.projection_rules(&mut rules);
         self.projection_rules_subquery(&mut rules);
+        self.projection_merge_rules(&mut rules);
         self.limit_rules(&mut rules);
         self.filter_rules(&mut rules);
         self.filter_rules_subquery(&mut rules);
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/projection.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/projection.rs
index 65f80e07b6..bfacf3094e 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/projection.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/projection.rs
@@ -1,16 +1,17 @@
 use crate::{
     compile::rewrite::{
-        cube_scan_wrapper, projection,
+        cube_scan_wrapper, projection, rewrite,
         rewriter::{CubeEGraph, CubeRewrite},
         rules::wrapper::WrapperRules,
         subquery, transforming_rewrite, wrapped_select, wrapped_select_aggr_expr_empty_tail,
         wrapped_select_filter_expr_empty_tail, wrapped_select_group_expr_empty_tail,
         wrapped_select_having_expr_empty_tail, wrapped_select_joins_empty_tail,
-        wrapped_select_order_expr_empty_tail, wrapped_select_subqueries_empty_tail,
-        wrapped_select_window_expr_empty_tail, wrapper_pullup_replacer, wrapper_pushdown_replacer,
-        wrapper_replacer_context, ListType, LogicalPlanLanguage, ProjectionAlias,
-        WrappedSelectAlias, WrappedSelectPushToCube, WrappedSelectUngroupedScan,
-        WrapperReplacerContextPushToCube, WrapperReplacerContextUngroupedScan,
+        wrapped_select_order_expr_empty_tail, wrapped_select_projection_expr_empty_tail,
+        wrapped_select_subqueries_empty_tail, wrapped_select_window_expr_empty_tail,
+        wrapper_pullup_replacer, wrapper_pushdown_replacer, wrapper_replacer_context, ListType,
+        LogicalPlanLanguage, ProjectionAlias, WrappedSelectAlias, WrappedSelectPushToCube,
+        WrappedSelectUngroupedScan, WrapperReplacerContextPushToCube,
+        WrapperReplacerContextUngroupedScan,
     },
     copy_flag, var, var_iter,
 };
@@ -329,6 +330,248 @@ impl WrapperRules {
             ),
         )]);
     }
+
+    pub fn projection_merge_rules(&self, rules: &mut Vec<CubeRewrite>) {
+        rules.extend(vec![rewrite(
+            "wrapper-merge-projection-with-inner-wrapped-select",
+            // Input is not a finished wrapper_pullup_replacer, but WrappedSelect just before pullup
+            // After pullup replacer would disable push to cube, because any node on top would have WrappedSelect in `from`
+            // So there would be no CubeScan to push to
+            // Instead, this rule tries to catch `from` before pulling up, and merge outer Filter into inner WrappedSelect
+            projection(
+                "?projection_expr",
+                cube_scan_wrapper(
+                    wrapped_select(
+                        "WrappedSelectSelectType:Projection",
+                        wrapper_pullup_replacer(
+                            wrapped_select_projection_expr_empty_tail(),
+                            wrapper_replacer_context(
+                                "?alias_to_cube",
+                                "WrapperReplacerContextPushToCube:true",
+                                "WrapperReplacerContextInProjection:false",
+                                "?cube_members",
+                                "?grouped_subqueries",
+                                "?ungrouped_scan",
+                            ),
+                        ),
+                        wrapper_pullup_replacer(
+                            wrapped_select_subqueries_empty_tail(),
+                            wrapper_replacer_context(
+                                "?alias_to_cube",
+                                "WrapperReplacerContextPushToCube:true",
+                                "WrapperReplacerContextInProjection:false",
+                                "?cube_members",
+                                "?grouped_subqueries",
+                                "?ungrouped_scan",
+                            ),
+                        ),
+                        wrapper_pullup_replacer(
+                            wrapped_select_group_expr_empty_tail(),
+                            wrapper_replacer_context(
+                                "?alias_to_cube",
+                                "WrapperReplacerContextPushToCube:true",
+                                "WrapperReplacerContextInProjection:false",
+                                "?cube_members",
+                                "?grouped_subqueries",
+                                "?ungrouped_scan",
+                            ),
+                        ),
+                        wrapper_pullup_replacer(
+                            wrapped_select_aggr_expr_empty_tail(),
+                            wrapper_replacer_context(
+                                "?alias_to_cube",
+                                "WrapperReplacerContextPushToCube:true",
+                                "WrapperReplacerContextInProjection:false",
+                                "?cube_members",
+                                "?grouped_subqueries",
+                                "?ungrouped_scan",
+                            ),
+                        ),
+                        wrapper_pullup_replacer(
+                            wrapped_select_window_expr_empty_tail(),
+                            wrapper_replacer_context(
+                                "?alias_to_cube",
+                                "WrapperReplacerContextPushToCube:true",
+                                "WrapperReplacerContextInProjection:false",
+                                "?cube_members",
+                                "?grouped_subqueries",
+                                "?ungrouped_scan",
+                            ),
+                        ),
+                        wrapper_pullup_replacer(
+                            "?inner_from",
+                            wrapper_replacer_context(
+                                "?alias_to_cube",
+                                "WrapperReplacerContextPushToCube:true",
+                                "WrapperReplacerContextInProjection:false",
+                                "?cube_members",
+                                "?grouped_subqueries",
+                                "?ungrouped_scan",
+                            ),
+                        ),
+                        wrapper_pullup_replacer(
+                            "?inner_joins",
+                            wrapper_replacer_context(
+                                "?alias_to_cube",
+                                "WrapperReplacerContextPushToCube:true",
+                                "WrapperReplacerContextInProjection:false",
+                                "?cube_members",
+                                "?grouped_subqueries",
+                                "?ungrouped_scan",
+                            ),
+                        ),
+                        wrapper_pullup_replacer(
+                            "?inner_filter",
+                            wrapper_replacer_context(
+                                "?alias_to_cube",
+                                "WrapperReplacerContextPushToCube:true",
+                                "WrapperReplacerContextInProjection:false",
+                                "?cube_members",
+                                "?grouped_subqueries",
+                                "?ungrouped_scan",
+                            ),
+                        ),
+                        wrapped_select_having_expr_empty_tail(),
+                        // Inner must not have limit and offset, because they are not commutative with aggregation
+                        "WrappedSelectLimit:None",
+                        "WrappedSelectOffset:None",
+                        wrapper_pullup_replacer(
+                            wrapped_select_order_expr_empty_tail(),
+                            wrapper_replacer_context(
+                                "?alias_to_cube",
+                                "WrapperReplacerContextPushToCube:true",
+                                "WrapperReplacerContextInProjection:false",
+                                "?cube_members",
+                                "?grouped_subqueries",
+                                "?ungrouped_scan",
+                            ),
+                        ),
+                        "WrappedSelectAlias:None",
+                        "WrappedSelectDistinct:false",
+                        "WrappedSelectPushToCube:true",
+                        "WrappedSelectUngroupedScan:true",
+                    ),
+                    "CubeScanWrapperFinalized:false",
+                ),
+                // TODO support merging projection with aliases
+                "ProjectionAlias:None",
+                "ProjectionSplit:false",
+            ),
+            cube_scan_wrapper(
+                wrapped_select(
+                    "WrappedSelectSelectType:Projection",
+                    wrapper_pushdown_replacer(
+                        "?projection_expr",
+                        wrapper_replacer_context(
+                            "?alias_to_cube",
+                            "WrapperReplacerContextPushToCube:true",
+                            "WrapperReplacerContextInProjection:true",
+                            "?cube_members",
+                            "?grouped_subqueries",
+                            "WrapperReplacerContextUngroupedScan:true",
+                        ),
+                    ),
+                    wrapper_pullup_replacer(
+                        wrapped_select_subqueries_empty_tail(),
+                        wrapper_replacer_context(
+                            "?alias_to_cube",
+                            "WrapperReplacerContextPushToCube:true",
+                            "WrapperReplacerContextInProjection:true",
+                            "?cube_members",
+                            "?grouped_subqueries",
+                            "WrapperReplacerContextUngroupedScan:true",
+                        ),
+                    ),
+                    wrapper_pullup_replacer(
+                        wrapped_select_group_expr_empty_tail(),
+                        wrapper_replacer_context(
+                            "?alias_to_cube",
+                            "WrapperReplacerContextPushToCube:true",
+                            "WrapperReplacerContextInProjection:true",
+                            "?cube_members",
+                            "?grouped_subqueries",
+                            "WrapperReplacerContextUngroupedScan:true",
+                        ),
+                    ),
+                    wrapper_pullup_replacer(
+                        wrapped_select_aggr_expr_empty_tail(),
+                        wrapper_replacer_context(
+                            "?alias_to_cube",
+                            "WrapperReplacerContextPushToCube:true",
+                            "WrapperReplacerContextInProjection:true",
+                            "?cube_members",
+                            "?grouped_subqueries",
+                            "WrapperReplacerContextUngroupedScan:true",
+                        ),
+                    ),
+                    wrapper_pullup_replacer(
+                        wrapped_select_window_expr_empty_tail(),
+                        wrapper_replacer_context(
+                            "?alias_to_cube",
+                            "WrapperReplacerContextPushToCube:true",
+                            "WrapperReplacerContextInProjection:true",
+                            "?cube_members",
+                            "?grouped_subqueries",
+                            "WrapperReplacerContextUngroupedScan:true",
+                        ),
+                    ),
+                    wrapper_pullup_replacer(
+                        "?inner_from",
+                        wrapper_replacer_context(
+                            "?alias_to_cube",
+                            "WrapperReplacerContextPushToCube:true",
+                            "WrapperReplacerContextInProjection:true",
+                            "?cube_members",
+                            "?grouped_subqueries",
+                            "WrapperReplacerContextUngroupedScan:true",
+                        ),
+                    ),
+                    wrapper_pullup_replacer(
+                        "?inner_joins",
+                        wrapper_replacer_context(
+                            "?alias_to_cube",
+                            "WrapperReplacerContextPushToCube:true",
+                            "WrapperReplacerContextInProjection:true",
+                            "?cube_members",
+                            "?grouped_subqueries",
+                            "WrapperReplacerContextUngroupedScan:true",
+                        ),
+                    ),
+                    wrapper_pullup_replacer(
+                        "?inner_filter",
+                        wrapper_replacer_context(
+                            "?alias_to_cube",
+                            "WrapperReplacerContextPushToCube:true",
+                            "WrapperReplacerContextInProjection:true",
+                            "?cube_members",
+                            "?grouped_subqueries",
+                            "WrapperReplacerContextUngroupedScan:true",
+                        ),
+                    ),
+                    wrapped_select_having_expr_empty_tail(),
+                    "WrappedSelectLimit:None",
+                    "WrappedSelectOffset:None",
+                    wrapper_pullup_replacer(
+                        wrapped_select_order_expr_empty_tail(),
+                        wrapper_replacer_context(
+                            "?alias_to_cube",
+                            "WrapperReplacerContextPushToCube:true",
+                            "WrapperReplacerContextInProjection:true",
+                            "?cube_members",
+                            "?grouped_subqueries",
+                            "WrapperReplacerContextUngroupedScan:true",
+                        ),
+                    ),
+                    "WrappedSelectAlias:None",
+                    "WrappedSelectDistinct:false",
+                    "WrappedSelectPushToCube:true",
+                    "WrappedSelectUngroupedScan:true",
+                ),
+                "CubeScanWrapperFinalized:false",
+            ),
+        )]);
+    }
+
     fn transform_projection(
         &self,
         expr_var: &'static str,
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/subquery.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/subquery.rs
index 5e9844aea7..1164e61d72 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/subquery.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/rules/wrapper/subquery.rs
@@ -81,36 +81,36 @@ impl WrapperRules {
             for name in var_iter!(
                 egraph[subst[source_table_name_var]],
                 EmptyRelationDerivedSourceTableName
-            ) {
-                if let Some(name) = name {
-                    if let Some(cube) = meta_context
-                        .cubes
-                        .iter()
-                        .find(|c| c.name.eq_ignore_ascii_case(name))
-                    {
-                        subst.insert(
-                            alias_to_cube_var,
-                            egraph.add(LogicalPlanLanguage::WrapperReplacerContextAliasToCube(
-                                WrapperReplacerContextAliasToCube(vec![(
-                                    "".to_string(),
-                                    cube.name.to_string(),
-                                )]),
-                            )),
-                        );
-                        // We don't want to mark current query as a grouped, because we create pullup replacer out of thin air here
-                        // And it would need to match other replacers later
-                        // At the same time, this pullup replacer have no subqueries on its own
-                        // So whoever want to treat this as subquery would introduce it to grouped_subqueries
-                        subst.insert(
-                            grouped_subqueries_out_var,
-                            egraph.add(
-                                LogicalPlanLanguage::WrapperReplacerContextGroupedSubqueries(
-                                    WrapperReplacerContextGroupedSubqueries(vec![]),
-                                ),
+            )
+            .flatten()
+            {
+                if let Some(cube) = meta_context
+                    .cubes
+                    .iter()
+                    .find(|c| c.name.eq_ignore_ascii_case(name))
+                {
+                    subst.insert(
+                        alias_to_cube_var,
+                        egraph.add(LogicalPlanLanguage::WrapperReplacerContextAliasToCube(
+                            WrapperReplacerContextAliasToCube(vec![(
+                                "".to_string(),
+                                cube.name.to_string(),
+                            )]),
+                        )),
+                    );
+                    // We don't want to mark current query as a grouped, because we create pullup replacer out of thin air here
+                    // And it would need to match other replacers later
+                    // At the same time, this pullup replacer have no subqueries on its own
+                    // So whoever want to treat this as subquery would introduce it to grouped_subqueries
+                    subst.insert(
+                        grouped_subqueries_out_var,
+                        egraph.add(
+                            LogicalPlanLanguage::WrapperReplacerContextGroupedSubqueries(
+                                WrapperReplacerContextGroupedSubqueries(vec![]),
                             ),
-                        );
-                        return true;
-                    }
+                        ),
+                    );
+                    return true;
                 }
             }
 
diff --git a/rust/cubesql/cubesql/src/compile/test/mod.rs b/rust/cubesql/cubesql/src/compile/test/mod.rs
index c9b789270b..44ea0b0db3 100644
--- a/rust/cubesql/cubesql/src/compile/test/mod.rs
+++ b/rust/cubesql/cubesql/src/compile/test/mod.rs
@@ -93,6 +93,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                 CubeMetaMeasure {
                     name: "KibanaSampleDataEcommerce.count".to_string(),
                     title: None,
+                    short_title: None,
                     description: Some("Events count".to_string()),
                     r#type: "number".to_string(),
                     agg_type: Some("count".to_string()),
@@ -101,6 +102,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                 CubeMetaMeasure {
                     name: "KibanaSampleDataEcommerce.maxPrice".to_string(),
                     title: None,
+                    short_title: None,
                     description: None,
                     r#type: "number".to_string(),
                     agg_type: Some("max".to_string()),
@@ -109,6 +111,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                 CubeMetaMeasure {
                     name: "KibanaSampleDataEcommerce.sumPrice".to_string(),
                     title: None,
+                    short_title: None,
                     description: None,
                     r#type: "number".to_string(),
                     agg_type: Some("sum".to_string()),
@@ -117,6 +120,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                 CubeMetaMeasure {
                     name: "KibanaSampleDataEcommerce.minPrice".to_string(),
                     title: None,
+                    short_title: None,
                     description: None,
                     r#type: "number".to_string(),
                     agg_type: Some("min".to_string()),
@@ -125,6 +129,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                 CubeMetaMeasure {
                     name: "KibanaSampleDataEcommerce.avgPrice".to_string(),
                     title: None,
+                    short_title: None,
                     description: None,
                     r#type: "number".to_string(),
                     agg_type: Some("avg".to_string()),
@@ -133,6 +138,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                 CubeMetaMeasure {
                     name: "KibanaSampleDataEcommerce.countDistinct".to_string(),
                     title: None,
+                    short_title: None,
                     description: None,
                     r#type: "number".to_string(),
                     agg_type: Some("countDistinct".to_string()),
@@ -160,6 +166,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                 relationship: "belongsTo".to_string(),
             }]),
             folders: None,
+            hierarchies: None,
             meta: None,
         },
         CubeMeta {
@@ -188,6 +195,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                 CubeMetaMeasure {
                     name: "Logs.agentCount".to_string(),
                     title: None,
+                    short_title: None,
                     description: None,
                     r#type: "number".to_string(),
                     agg_type: Some("countDistinct".to_string()),
@@ -196,6 +204,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                 CubeMetaMeasure {
                     name: "Logs.agentCountApprox".to_string(),
                     title: None,
+                    short_title: None,
                     description: None,
                     r#type: "number".to_string(),
                     agg_type: Some("countDistinctApprox".to_string()),
@@ -208,6 +217,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                 relationship: "belongsTo".to_string(),
             }]),
             folders: None,
+            hierarchies: None,
             meta: None,
         },
         CubeMeta {
@@ -219,6 +229,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
             measures: vec![CubeMetaMeasure {
                 name: "NumberCube.someNumber".to_string(),
                 title: None,
+                short_title: None,
                 description: None,
                 r#type: "number".to_string(),
                 agg_type: Some("number".to_string()),
@@ -227,6 +238,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
             segments: vec![],
             joins: None,
             folders: None,
+            hierarchies: None,
             meta: None,
         },
         CubeMeta {
@@ -247,6 +259,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                     r#type: "number".to_string(),
                     agg_type: Some("number".to_string()),
                     title: None,
+                    short_title: None,
                     description: None,
                     meta: None,
                 })
@@ -255,6 +268,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                         CubeMetaMeasure {
                             name: "WideCube.count".to_string(),
                             title: None,
+                            short_title: None,
                             description: None,
                             r#type: "number".to_string(),
                             agg_type: Some("count".to_string()),
@@ -263,6 +277,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                         CubeMetaMeasure {
                             name: "WideCube.maxPrice".to_string(),
                             title: None,
+                            short_title: None,
                             description: None,
                             r#type: "number".to_string(),
                             agg_type: Some("max".to_string()),
@@ -271,6 +286,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                         CubeMetaMeasure {
                             name: "WideCube.minPrice".to_string(),
                             title: None,
+                            short_title: None,
                             description: None,
                             r#type: "number".to_string(),
                             agg_type: Some("min".to_string()),
@@ -279,6 +295,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                         CubeMetaMeasure {
                             name: "WideCube.avgPrice".to_string(),
                             title: None,
+                            short_title: None,
                             description: None,
                             r#type: "number".to_string(),
                             agg_type: Some("avg".to_string()),
@@ -287,6 +304,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                         CubeMetaMeasure {
                             name: "WideCube.countDistinct".to_string(),
                             title: None,
+                            short_title: None,
                             description: None,
                             r#type: "number".to_string(),
                             agg_type: Some("countDistinct".to_string()),
@@ -299,6 +317,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
             segments: Vec::new(),
             joins: Some(Vec::new()),
             folders: None,
+            hierarchies: None,
             meta: None,
         },
         CubeMeta {
@@ -338,6 +357,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                             r#type: "number".to_string(),
                             agg_type: Some("number".to_string()),
                             title: None,
+                            short_title: None,
                             description: Some(format!("Test number measure {i}")),
                             meta: None,
                         },
@@ -346,6 +366,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                             r#type: "string".to_string(),
                             agg_type: Some("max".to_string()),
                             title: None,
+                            short_title: None,
                             description: Some(format!("Test max(string) measure {i}")),
                             meta: None,
                         },
@@ -354,6 +375,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                             r#type: "time".to_string(),
                             agg_type: Some("max".to_string()),
                             title: None,
+                            short_title: None,
                             description: Some(format!("Test max(time) measure {i}")),
                             meta: None,
                         },
@@ -364,6 +386,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                         CubeMetaMeasure {
                             name: "MultiTypeCube.count".to_string(),
                             title: None,
+                            short_title: None,
                             description: Some("Test count measure".to_string()),
                             r#type: "number".to_string(),
                             agg_type: Some("count".to_string()),
@@ -372,6 +395,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                         CubeMetaMeasure {
                             name: "MultiTypeCube.maxPrice".to_string(),
                             title: None,
+                            short_title: None,
                             description: Some("Test maxPrice measure".to_string()),
                             r#type: "number".to_string(),
                             agg_type: Some("max".to_string()),
@@ -380,6 +404,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                         CubeMetaMeasure {
                             name: "MultiTypeCube.minPrice".to_string(),
                             title: None,
+                            short_title: None,
                             description: Some("Test minPrice measure".to_string()),
                             r#type: "number".to_string(),
                             agg_type: Some("min".to_string()),
@@ -388,6 +413,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                         CubeMetaMeasure {
                             name: "MultiTypeCube.avgPrice".to_string(),
                             title: None,
+                            short_title: None,
                             description: Some("Test avgPrice measure".to_string()),
                             r#type: "number".to_string(),
                             agg_type: Some("avg".to_string()),
@@ -396,6 +422,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
                         CubeMetaMeasure {
                             name: "MultiTypeCube.countDistinct".to_string(),
                             title: None,
+                            short_title: None,
                             description: Some("Test countDistinct measure".to_string()),
                             r#type: "number".to_string(),
                             agg_type: Some("countDistinct".to_string()),
@@ -408,6 +435,7 @@ pub fn get_test_meta() -> Vec<CubeMeta> {
             segments: Vec::new(),
             joins: Some(Vec::new()),
             folders: None,
+            hierarchies: None,
             meta: None,
         },
     ]
@@ -423,6 +451,7 @@ pub fn get_string_cube_meta() -> Vec<CubeMeta> {
         measures: vec![CubeMetaMeasure {
             name: "StringCube.someString".to_string(),
             title: None,
+            short_title: None,
             description: None,
             r#type: "string".to_string(),
             agg_type: Some("string".to_string()),
@@ -431,6 +460,7 @@ pub fn get_string_cube_meta() -> Vec<CubeMeta> {
         segments: vec![],
         joins: None,
         folders: None,
+        hierarchies: None,
         meta: None,
     }]
 }
@@ -446,6 +476,7 @@ pub fn get_sixteen_char_member_cube() -> Vec<CubeMeta> {
             CubeMetaMeasure {
                 name: "SixteenChar.sixteen_charchar".to_string(),
                 title: None,
+                short_title: None,
                 description: None,
                 r#type: "number".to_string(),
                 agg_type: Some("sum".to_string()),
@@ -454,6 +485,7 @@ pub fn get_sixteen_char_member_cube() -> Vec<CubeMeta> {
             CubeMetaMeasure {
                 name: "SixteenChar.sixteen_charchar_foo".to_string(),
                 title: None,
+                short_title: None,
                 description: None,
                 r#type: "number".to_string(),
                 agg_type: Some("avg".to_string()),
@@ -462,6 +494,7 @@ pub fn get_sixteen_char_member_cube() -> Vec<CubeMeta> {
             CubeMetaMeasure {
                 name: "SixteenChar.sixteen_charchar_bar".to_string(),
                 title: None,
+                short_title: None,
                 description: None,
                 r#type: "number".to_string(),
                 agg_type: Some("count".to_string()),
@@ -471,6 +504,7 @@ pub fn get_sixteen_char_member_cube() -> Vec<CubeMeta> {
         segments: vec![],
         joins: None,
         folders: None,
+        hierarchies: None,
         meta: None,
     }]
 }
@@ -623,7 +657,7 @@ OFFSET {{ offset }}{% endif %}"#.to_string(),
                     ("types/interval".to_string(), "INTERVAL".to_string()),
                     ("types/binary".to_string(), "BINARY".to_string()),
                 ]
-                    .into_iter().chain(custom_templates.into_iter())
+                    .into_iter().chain(custom_templates)
                     .collect(),
                     false,
             )
@@ -794,7 +828,7 @@ impl TransportService for TestConnectionTransport {
                     "SELECT * FROM {}",
                     serde_json::to_string_pretty(&inputs).unwrap()
                 ),
-                expression_params.unwrap_or(Vec::new()),
+                expression_params.unwrap_or_default(),
             ),
         })
     }
diff --git a/rust/cubesql/cubesql/src/compile/test/test_filters.rs b/rust/cubesql/cubesql/src/compile/test/test_filters.rs
index 096cabbb28..a400253886 100644
--- a/rust/cubesql/cubesql/src/compile/test/test_filters.rs
+++ b/rust/cubesql/cubesql/src/compile/test/test_filters.rs
@@ -1,4 +1,5 @@
 use cubeclient::models::{V1LoadRequestQuery, V1LoadRequestQueryFilterItem};
+use datafusion::physical_plan::displayable;
 use pretty_assertions::assert_eq;
 
 use crate::compile::{
@@ -60,3 +61,75 @@ GROUP BY
         }
     );
 }
+
+#[tokio::test]
+async fn test_filter_dim_in_null() {
+    if !Rewriter::sql_push_down_enabled() {
+        return;
+    }
+    init_testing_logger();
+
+    let query_plan = convert_select_to_query_plan(
+        // language=PostgreSQL
+        r#"
+        SELECT
+            dim_str0
+        FROM
+            MultiTypeCube
+        WHERE dim_str1 IN (NULL)
+        "#
+        .to_string(),
+        DatabaseProtocol::PostgreSQL,
+    )
+    .await;
+
+    let physical_plan = query_plan.as_physical_plan().await.unwrap();
+    println!(
+        "Physical plan: {}",
+        displayable(physical_plan.as_ref()).indent()
+    );
+
+    // For now this tests only that query is rewritable
+    // TODO support this as "notSet" filter
+
+    assert!(query_plan
+        .as_logical_plan()
+        .find_cube_scan_wrapped_sql()
+        .wrapped_sql
+        .sql
+        .contains(r#"\"expr\":\"${MultiTypeCube.dim_str1} IN (NULL)\""#));
+}
+
+#[tokio::test]
+async fn test_filter_superset_is_null() {
+    if !Rewriter::sql_push_down_enabled() {
+        return;
+    }
+    init_testing_logger();
+
+    let query_plan = convert_select_to_query_plan(
+        // language=PostgreSQL
+        r#"
+SELECT dim_str0 FROM MultiTypeCube WHERE (dim_str1 IS NULL OR dim_str1 IN (NULL) AND (1<>1))
+        "#
+        .to_string(),
+        DatabaseProtocol::PostgreSQL,
+    )
+    .await;
+
+    let physical_plan = query_plan.as_physical_plan().await.unwrap();
+    println!(
+        "Physical plan: {}",
+        displayable(physical_plan.as_ref()).indent()
+    );
+
+    // For now this tests only that query is rewritable
+    // TODO support this as "notSet" filter
+
+    assert!(query_plan
+        .as_logical_plan()
+        .find_cube_scan_wrapped_sql()
+        .wrapped_sql
+        .sql
+        .contains(r#"\"expr\":\"((${MultiTypeCube.dim_str1} IS NULL) OR (${MultiTypeCube.dim_str1} IN (NULL) AND FALSE))\""#));
+}
diff --git a/rust/cubesql/cubesql/src/compile/test/test_user_change.rs b/rust/cubesql/cubesql/src/compile/test/test_user_change.rs
index ae2a8b2e17..3cad0a3b6d 100644
--- a/rust/cubesql/cubesql/src/compile/test/test_user_change.rs
+++ b/rust/cubesql/cubesql/src/compile/test/test_user_change.rs
@@ -258,6 +258,7 @@ FROM
     KibanaSampleDataEcommerce
 WHERE
     __user = 'gopher'
+    AND LOWER(customer_gender) = 'test'
 GROUP BY 1
 ;
         "#
diff --git a/rust/cubesql/cubesql/src/compile/test/test_wrapper.rs b/rust/cubesql/cubesql/src/compile/test/test_wrapper.rs
index abc8e1a8b5..489062c800 100644
--- a/rust/cubesql/cubesql/src/compile/test/test_wrapper.rs
+++ b/rust/cubesql/cubesql/src/compile/test/test_wrapper.rs
@@ -1417,3 +1417,184 @@ async fn wrapper_agg_dimension_over_limit() {
         .sql
         .contains("\"ungrouped\": true"));
 }
+
+// TODO allow number measures and add test for those
+/// Projection(Filter(CubeScan(ungrouped))) should have projection expressions pushed down to Cube
+#[tokio::test]
+async fn wrapper_projection_flatten_simple_measure() {
+    if !Rewriter::sql_push_down_enabled() {
+        return;
+    }
+    init_testing_logger();
+
+    let query_plan = convert_select_to_query_plan(
+        // language=PostgreSQL
+        r#"
+SELECT
+  maxPrice
+FROM
+  MultiTypeCube
+WHERE
+  LOWER(CAST(dim_num0 AS TEXT)) = 'all'
+;
+        "#
+        .to_string(),
+        DatabaseProtocol::PostgreSQL,
+    )
+    .await;
+
+    let physical_plan = query_plan.as_physical_plan().await.unwrap();
+    println!(
+        "Physical plan: {}",
+        displayable(physical_plan.as_ref()).indent()
+    );
+
+    let request = query_plan
+        .as_logical_plan()
+        .find_cube_scan_wrapped_sql()
+        .request;
+    assert_eq!(request.measures.unwrap().len(), 1);
+    assert_eq!(request.dimensions.unwrap().len(), 0);
+}
+
+#[tokio::test]
+async fn wrapper_duplicated_members() {
+    if !Rewriter::sql_push_down_enabled() {
+        return;
+    }
+    init_testing_logger();
+
+    let query_plan = convert_select_to_query_plan(
+        // language=PostgreSQL
+        format!(
+            r#"
+SELECT
+    "foo",
+    "bar",
+    CASE
+        WHEN "bar" IS NOT NULL
+        THEN 1
+        ELSE 0
+        END
+    AS "bar_expr"
+FROM (
+    SELECT
+        "rows"."foo" AS "foo",
+        "rows"."bar" AS "bar"
+    FROM (
+        SELECT
+            "dim_str0" AS "foo",
+            "dim_str0" AS "bar"
+        FROM MultiTypeCube
+    ) "rows"
+    GROUP BY
+        "foo",
+        "bar"
+) "_"
+ORDER BY
+    "bar_expr"
+LIMIT 1
+;
+        "#
+        )
+        .to_string(),
+        DatabaseProtocol::PostgreSQL,
+    )
+    .await;
+
+    let physical_plan = query_plan.as_physical_plan().await.unwrap();
+    println!(
+        "Physical plan: {}",
+        displayable(physical_plan.as_ref()).indent()
+    );
+
+    let logical_plan = query_plan.as_logical_plan();
+    // Generated SQL should contain realiasing of one member to two columns
+    assert!(logical_plan
+        .find_cube_scan_wrapped_sql()
+        .wrapped_sql
+        .sql
+        .contains(r#""foo" "foo""#));
+    assert!(logical_plan
+        .find_cube_scan_wrapped_sql()
+        .wrapped_sql
+        .sql
+        .contains(r#""foo" "bar""#));
+}
+
+/// Simple wrapper with cast should have explicit members, not zero
+#[tokio::test]
+async fn wrapper_cast_limit_explicit_members() {
+    if !Rewriter::sql_push_down_enabled() {
+        return;
+    }
+    init_testing_logger();
+
+    let query_plan = convert_select_to_query_plan(
+        // language=PostgreSQL
+        r#"
+        SELECT
+            CAST(dim_date0 AS DATE) AS "dim_date0"
+        FROM
+            MultiTypeCube
+        LIMIT 10
+        ;
+        "#
+        .to_string(),
+        DatabaseProtocol::PostgreSQL,
+    )
+    .await;
+
+    let physical_plan = query_plan.as_physical_plan().await.unwrap();
+    println!(
+        "Physical plan: {}",
+        displayable(physical_plan.as_ref()).indent()
+    );
+
+    // Query should mention just a single member
+    let request = query_plan
+        .as_logical_plan()
+        .find_cube_scan_wrapped_sql()
+        .request;
+    assert_eq!(request.measures.unwrap().len(), 1);
+    assert_eq!(request.dimensions.unwrap().len(), 0);
+}
+
+#[tokio::test]
+async fn wrapper_typed_null() {
+    if !Rewriter::sql_push_down_enabled() {
+        return;
+    }
+    init_testing_logger();
+
+    let query_plan = convert_select_to_query_plan(
+        // language=PostgreSQL
+        r#"
+        SELECT
+            dim_str0,
+            AVG(avgPrice),
+            CASE
+                WHEN SUM((NULLIF(0.0, 0.0))) IS NOT NULL THEN SUM((NULLIF(0.0, 0.0)))
+                ELSE 0
+                END
+        FROM MultiTypeCube
+        GROUP BY 1
+        ;"#
+        .to_string(),
+        DatabaseProtocol::PostgreSQL,
+    )
+    .await;
+
+    let physical_plan = query_plan.as_physical_plan().await.unwrap();
+    println!(
+        "Physical plan: {}",
+        displayable(physical_plan.as_ref()).indent()
+    );
+
+    assert!(query_plan
+        .as_logical_plan()
+        .find_cube_scan_wrapped_sql()
+        .wrapped_sql
+        .sql
+        .contains("SUM(CAST(NULL AS DOUBLE))"));
+}
diff --git a/rust/cubesql/cubesql/src/lib.rs b/rust/cubesql/cubesql/src/lib.rs
index ae7f986c92..10845a40c3 100644
--- a/rust/cubesql/cubesql/src/lib.rs
+++ b/rust/cubesql/cubesql/src/lib.rs
@@ -2,16 +2,8 @@
     // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
     clippy::nonstandard_macro_braces,
 )]
-#![feature(test)]
-// #![feature(backtrace)]
-#![feature(async_closure)]
-#![feature(box_patterns)]
-// #![feature(slice_internals)]
-#![feature(vec_into_raw_parts)]
-#![feature(hash_set_entry)]
 // #![feature(trace_macros)]
 #![recursion_limit = "2048"]
-#![feature(error_generic_member_access)]
 
 // trace_macros!(false);
 
diff --git a/rust/cubesql/cubesql/src/sql/compiler_cache.rs b/rust/cubesql/cubesql/src/sql/compiler_cache.rs
index d162a95021..56d5172240 100644
--- a/rust/cubesql/cubesql/src/sql/compiler_cache.rs
+++ b/rust/cubesql/cubesql/src/sql/compiler_cache.rs
@@ -212,7 +212,7 @@ impl CompilerCache for CompilerCacheImpl {
                         )),
                     });
                     compiler_id_to_entry.put(
-                        (meta_context.compiler_id.clone(), protocol.clone()),
+                        (meta_context.compiler_id, protocol.clone()),
                         cache_entry.clone(),
                     );
                     cache_entry
diff --git a/rust/cubesql/cubesql/src/sql/postgres/extended.rs b/rust/cubesql/cubesql/src/sql/postgres/extended.rs
index fc57a7efdf..02af3b40d2 100644
--- a/rust/cubesql/cubesql/src/sql/postgres/extended.rs
+++ b/rust/cubesql/cubesql/src/sql/postgres/extended.rs
@@ -87,9 +87,9 @@ impl PreparedStatement {
 
     pub fn get_from_sql(&self) -> bool {
         match self {
-            PreparedStatement::Empty { from_sql, .. } => from_sql.clone(),
-            PreparedStatement::Query { from_sql, .. } => from_sql.clone(),
-            PreparedStatement::Error { from_sql, .. } => from_sql.clone(),
+            PreparedStatement::Empty { from_sql, .. } => *from_sql,
+            PreparedStatement::Query { from_sql, .. } => *from_sql,
+            PreparedStatement::Error { from_sql, .. } => *from_sql,
         }
     }
 
@@ -299,7 +299,7 @@ impl Portal {
     }
 
     pub fn get_format(&self) -> protocol::Format {
-        self.format.clone()
+        self.format
     }
 
     fn hand_execution_frame_state<'a>(
diff --git a/rust/cubesql/cubesql/src/sql/postgres/shim.rs b/rust/cubesql/cubesql/src/sql/postgres/shim.rs
index 5e99376d30..35de490d42 100644
--- a/rust/cubesql/cubesql/src/sql/postgres/shim.rs
+++ b/rust/cubesql/cubesql/src/sql/postgres/shim.rs
@@ -179,19 +179,19 @@ impl ConnectionError {
 
 impl From<CubeError> for ConnectionError {
     fn from(e: CubeError) -> Self {
-        ConnectionError::Cube(e.into(), None)
+        ConnectionError::Cube(e, None)
     }
 }
 
 impl From<CompilationError> for ConnectionError {
     fn from(e: CompilationError) -> Self {
-        ConnectionError::CompilationError(e.into(), None)
+        ConnectionError::CompilationError(e, None)
     }
 }
 
 impl From<ProtocolError> for ConnectionError {
     fn from(e: ProtocolError) -> Self {
-        ConnectionError::Protocol(e.into(), None)
+        ConnectionError::Protocol(e, None)
     }
 }
 
@@ -401,7 +401,7 @@ impl AsyncPostgresShim {
                             .log_load_state(
                                 span_id.clone(),
                                 auth_context,
-                                self.session.state.get_load_request_meta(),
+                                self.session.state.get_load_request_meta("sql"),
                                 "Load Request".to_string(),
                                 serde_json::json!({
                                     "query": span_id.as_ref().unwrap().query_key.clone(),
@@ -453,7 +453,7 @@ impl AsyncPostgresShim {
                                     .log_load_state(
                                         Some(span_id.clone()),
                                         auth_context,
-                                        self.session.state.get_load_request_meta(),
+                                        self.session.state.get_load_request_meta("sql"),
                                         "Data Query Status".to_string(),
                                         serde_json::json!({
                                             "isDataQuery": true
@@ -481,7 +481,7 @@ impl AsyncPostgresShim {
                                     .log_load_state(
                                         Some(span_id.clone()),
                                         auth_context.clone(),
-                                        self.session.state.get_load_request_meta(),
+                                        self.session.state.get_load_request_meta("sql"),
                                         "Data Query Status".to_string(),
                                         serde_json::json!({
                                             "isDataQuery": true,
@@ -496,7 +496,7 @@ impl AsyncPostgresShim {
                                     .log_load_state(
                                         Some(span_id.clone()),
                                         auth_context,
-                                        self.session.state.get_load_request_meta(),
+                                        self.session.state.get_load_request_meta("sql"),
                                         "Load Request Success".to_string(),
                                         serde_json::json!({
                                             "query": span_id.query_key.clone(),
@@ -602,7 +602,7 @@ impl AsyncPostgresShim {
                     .log_load_state(
                         Some(span_id.clone()),
                         auth_context,
-                        self.session.state.get_load_request_meta(),
+                        self.session.state.get_load_request_meta("sql"),
                         "SQL API Error".to_string(),
                         serde_json::json!({
                             "query": span_id.query_key.clone(),
@@ -803,7 +803,7 @@ impl AsyncPostgresShim {
             Ok((user, auth_context)) => {
                 let database = parameters
                     .get("database")
-                    .map(|v| v.clone())
+                    .cloned()
                     .unwrap_or("db".to_string());
                 self.session.state.set_database(Some(database));
                 self.session.state.set_user(Some(user));
@@ -1056,7 +1056,7 @@ impl AsyncPostgresShim {
             )
         })?;
 
-        let format = body.result_formats.first().unwrap_or(&Format::Text).clone();
+        let format = body.result_formats.first().copied().unwrap_or(Format::Text);
         let portal = match source_statement {
             PreparedStatement::Empty { .. } => {
                 drop(statements_guard);
@@ -1848,7 +1848,7 @@ impl AsyncPostgresShim {
                 .log_load_state(
                     span_id.clone(),
                     auth_context,
-                    self.session.state.get_load_request_meta(),
+                    self.session.state.get_load_request_meta("sql"),
                     "Load Request".to_string(),
                     serde_json::json!({
                         "query": {
@@ -1876,7 +1876,7 @@ impl AsyncPostgresShim {
                         .log_load_state(
                             Some(span_id.clone()),
                             auth_context,
-                            self.session.state.get_load_request_meta(),
+                            self.session.state.get_load_request_meta("sql"),
                             "Load Request Success".to_string(),
                             serde_json::json!({
                                 "query": {
diff --git a/rust/cubesql/cubesql/src/sql/postgres/writer.rs b/rust/cubesql/cubesql/src/sql/postgres/writer.rs
index 5007f4a1bf..b29a529eaa 100644
--- a/rust/cubesql/cubesql/src/sql/postgres/writer.rs
+++ b/rust/cubesql/cubesql/src/sql/postgres/writer.rs
@@ -64,7 +64,7 @@ impl ToProtocolValue for TimestampValue {
 
         match self.tz_ref() {
             None => as_str.to_text(buf),
-            Some(_) => (as_str + &"+00").to_text(buf),
+            Some(_) => (as_str + "+00").to_text(buf),
         }
     }
 
diff --git a/rust/cubesql/cubesql/src/sql/session.rs b/rust/cubesql/cubesql/src/sql/session.rs
index 75a4541ffc..abc909f099 100644
--- a/rust/cubesql/cubesql/src/sql/session.rs
+++ b/rust/cubesql/cubesql/src/sql/session.rs
@@ -339,12 +339,10 @@ impl SessionState {
             .expect("failed to unlock variables for reading");
 
         match &*guard {
-            Some(vars) => vars.get(name).map(|v| v.clone()),
+            Some(vars) => vars.get(name).cloned(),
             _ => match &self.protocol {
-                DatabaseProtocol::MySQL => MYSQL_DEFAULT_VARIABLES.get(name).map(|v| v.clone()),
-                DatabaseProtocol::PostgreSQL => {
-                    POSTGRES_DEFAULT_VARIABLES.get(name).map(|v| v.clone())
-                }
+                DatabaseProtocol::MySQL => MYSQL_DEFAULT_VARIABLES.get(name).cloned(),
+                DatabaseProtocol::PostgreSQL => POSTGRES_DEFAULT_VARIABLES.get(name).cloned(),
                 DatabaseProtocol::Extension(ext) => ext.get_session_variable_default(name),
             },
         }
@@ -377,7 +375,7 @@ impl SessionState {
         Arc::clone(&self.temp_tables)
     }
 
-    pub fn get_load_request_meta(&self) -> LoadRequestMeta {
+    pub fn get_load_request_meta(&self, api_type: &str) -> LoadRequestMeta {
         let application_name = if let Some(var) = self.get_variable("application_name") {
             Some(var.value.to_string())
         } else {
@@ -386,7 +384,7 @@ impl SessionState {
 
         LoadRequestMeta::new(
             self.protocol.get_name().to_string(),
-            "sql".to_string(),
+            api_type.to_string(),
             application_name,
         )
     }
@@ -462,7 +460,7 @@ impl From<&Session> for SessionStatActivity {
             application_name,
             client_addr: session.state.client_ip.clone(),
             client_hostname: None,
-            client_port: session.state.client_port.clone(),
+            client_port: session.state.client_port,
             query,
         }
     }
diff --git a/rust/cubesql/cubesql/src/sql/session_manager.rs b/rust/cubesql/cubesql/src/sql/session_manager.rs
index 764cae0980..7e35736919 100644
--- a/rust/cubesql/cubesql/src/sql/session_manager.rs
+++ b/rust/cubesql/cubesql/src/sql/session_manager.rs
@@ -59,7 +59,7 @@ impl SessionManager {
             server: self.server.clone(),
             state: Arc::new(SessionState::new(
                 connection_id,
-                extra_id.clone(),
+                extra_id,
                 client_addr,
                 client_port,
                 protocol,
@@ -107,12 +107,12 @@ impl SessionManager {
     pub async fn get_session(&self, connection_id: u32) -> Option<Arc<Session>> {
         let guard = self.sessions.read().await;
 
-        guard.sessions.get(&connection_id).map(|s| s.clone())
+        guard.sessions.get(&connection_id).cloned()
     }
 
     pub async fn get_session_by_extra_id(&self, extra_id: SessionExtraId) -> Option<Arc<Session>> {
         let guard = self.sessions.read().await;
-        guard.uid_to_session.get(&extra_id).map(|s| s.clone())
+        guard.uid_to_session.get(&extra_id).cloned()
     }
 
     pub async fn drop_session(&self, connection_id: u32) {
diff --git a/rust/cubesql/cubesql/src/sql/statement.rs b/rust/cubesql/cubesql/src/sql/statement.rs
index 9814a80fe6..c5253e7c83 100644
--- a/rust/cubesql/cubesql/src/sql/statement.rs
+++ b/rust/cubesql/cubesql/src/sql/statement.rs
@@ -1092,7 +1092,7 @@ impl<'ast> Visitor<'ast, ConnectionError> for SensitiveDataSanitizer {
             ast::Value::SingleQuotedString(str)
             | ast::Value::DoubleQuotedString(str)
             | ast::Value::NationalStringLiteral(str) => {
-                if vec!["false", "true"].contains(&str.as_str()) || str.len() < 4 {
+                if ["false", "true"].contains(&str.as_str()) || str.len() < 4 {
                     return Ok(());
                 }
                 *str = "[REPLACED]".to_string();
diff --git a/rust/cubesql/cubesql/src/sql/types.rs b/rust/cubesql/cubesql/src/sql/types.rs
index c14142a455..f294e5540f 100644
--- a/rust/cubesql/cubesql/src/sql/types.rs
+++ b/rust/cubesql/cubesql/src/sql/types.rs
@@ -89,7 +89,7 @@ impl ColumnType {
             ColumnType::Blob => DataType::Utf8,
             ColumnType::Decimal(p, s) => DataType::Decimal(*p, *s),
             ColumnType::List(field) => DataType::List(field.clone()),
-            ColumnType::Timestamp => DataType::Timestamp(TimeUnit::Millisecond, None),
+            ColumnType::Timestamp => DataType::Timestamp(TimeUnit::Nanosecond, None),
         }
     }
 }
diff --git a/rust/cubesql/cubesql/src/transport/ctx.rs b/rust/cubesql/cubesql/src/transport/ctx.rs
index 389623d510..997928730c 100644
--- a/rust/cubesql/cubesql/src/transport/ctx.rs
+++ b/rust/cubesql/cubesql/src/transport/ctx.rs
@@ -79,63 +79,53 @@ impl MetaContext {
         &self,
         alias_to_cube: &Vec<(String, String)>,
     ) -> Option<Arc<dyn SqlGenerator + Send + Sync>> {
-        let data_sources = alias_to_cube
+        let data_source = alias_to_cube
             .iter()
             .map(|(_, c)| self.cube_to_data_source.get(c))
-            .unique()
-            .collect::<Option<Vec<_>>>()?;
-        if data_sources.len() != 1 {
-            return None;
-        }
-        self.data_source_to_sql_generator
-            .get(data_sources[0].as_str())
-            .cloned()
-    }
+            .all_equal_value();
 
-    pub fn find_cube_with_name(&self, name: &str) -> Option<CubeMeta> {
-        for cube in self.cubes.iter() {
-            if cube.name.eq(&name) {
-                return Some(cube.clone());
-            }
-        }
+        // Don't care for non-equal data sources, nor for missing cube_to_data_source keys
+        let data_source = data_source.ok()??;
 
-        None
+        self.data_source_to_sql_generator.get(data_source).cloned()
     }
 
-    pub fn find_cube_by_column(
-        &self,
-        alias_to_cube: &Vec<(String, String)>,
+    pub fn find_cube_with_name(&self, name: &str) -> Option<&CubeMeta> {
+        self.cubes.iter().find(|&cube| cube.name == name)
+    }
+
+    pub fn find_cube_by_column<'meta, 'alias>(
+        &'meta self,
+        alias_to_cube: &'alias Vec<(String, String)>,
         column: &Column,
-    ) -> Option<(String, CubeMeta)> {
+    ) -> Option<(&'alias str, &'meta CubeMeta)> {
         (if let Some(rel) = column.relation.as_ref() {
             alias_to_cube.iter().find(|(a, _)| a == rel)
         } else {
             alias_to_cube.iter().find(|(_, c)| {
                 if let Some(cube) = self.find_cube_with_name(c) {
+                    // TODO replace cube.contains_member(&cube.member_name(...)) with searching by prepared column names
                     cube.contains_member(&cube.member_name(&column.name))
                 } else {
                     false
                 }
             })
         })
-        .and_then(|(a, c)| {
-            self.find_cube_with_name(c)
-                .map(|cube| (a.to_string(), cube))
-        })
+        .and_then(|(a, c)| self.find_cube_with_name(c).map(|cube| (a.as_str(), cube)))
     }
 
-    pub fn find_cube_by_column_for_replacer(
+    pub fn find_cube_by_column_for_replacer<'alias>(
         &self,
-        alias_to_cube: &Vec<((String, String), String)>,
+        alias_to_cube: &'alias Vec<((String, String), String)>,
         column: &Column,
-    ) -> Vec<((String, String), CubeMeta)> {
+    ) -> Vec<((&'alias str, &'alias str), &CubeMeta)> {
         if let Some(rel) = column.relation.as_ref() {
             alias_to_cube
                 .iter()
                 .filter_map(|((old, new), c)| {
                     if old == rel {
                         self.find_cube_with_name(c)
-                            .map(|cube| ((old.to_string(), new.to_string()), cube))
+                            .map(|cube| ((old.as_str(), new.as_str()), cube))
                     } else {
                         None
                     }
@@ -146,8 +136,9 @@ impl MetaContext {
                 .iter()
                 .filter_map(|((old, new), c)| {
                     if let Some(cube) = self.find_cube_with_name(c) {
+                        // TODO replace cube.contains_member(&cube.member_name(...)) with searching by prepared column names
                         if cube.contains_member(&cube.member_name(&column.name)) {
-                            return Some(((old.to_string(), new.to_string()), cube));
+                            return Some(((old.as_str(), new.as_str()), cube));
                         }
                     }
 
@@ -157,33 +148,33 @@ impl MetaContext {
         }
     }
 
-    pub fn find_measure_with_name(&self, name: String) -> Option<CubeMetaMeasure> {
-        let cube_and_member_name = name.split(".").collect::<Vec<_>>();
-        if let Some(cube) = self.find_cube_with_name(cube_and_member_name[0]) {
-            cube.lookup_measure(cube_and_member_name[1]).cloned()
-        } else {
-            None
-        }
+    pub fn find_measure_with_name(&self, name: &str) -> Option<&CubeMetaMeasure> {
+        let mut cube_and_member_name = name.split(".");
+        let cube_name = cube_and_member_name.next()?;
+        let member_name = cube_and_member_name.next()?;
+        let cube = self.find_cube_with_name(cube_name)?;
+        cube.lookup_measure(member_name)
     }
 
-    pub fn find_dimension_with_name(&self, name: String) -> Option<CubeMetaDimension> {
-        let cube_and_member_name = name.split(".").collect::<Vec<_>>();
-        if let Some(cube) = self.find_cube_with_name(cube_and_member_name[0]) {
-            cube.lookup_dimension(cube_and_member_name[1]).cloned()
-        } else {
-            None
-        }
+    pub fn find_dimension_with_name(&self, name: &str) -> Option<&CubeMetaDimension> {
+        let mut cube_and_member_name = name.split(".");
+        let cube_name = cube_and_member_name.next()?;
+        let member_name = cube_and_member_name.next()?;
+        let cube = self.find_cube_with_name(cube_name)?;
+        cube.lookup_dimension(member_name)
     }
 
-    pub fn is_synthetic_field(&self, name: String) -> bool {
-        let cube_and_member_name = name.split(".").collect::<Vec<_>>();
-        if cube_and_member_name.len() == 1
-            && MetaContext::is_synthetic_field_name(cube_and_member_name[0])
-        {
-            return true;
-        }
-        if let Some(_) = self.find_cube_with_name(cube_and_member_name[0]) {
-            MetaContext::is_synthetic_field_name(cube_and_member_name[1])
+    pub fn is_synthetic_field(&self, name: &str) -> bool {
+        let mut cube_and_member_name = name.split(".");
+        let Some(cube_name) = cube_and_member_name.next() else {
+            return false;
+        };
+        let Some(member_name) = cube_and_member_name.next() else {
+            return MetaContext::is_synthetic_field_name(cube_name);
+        };
+
+        if self.find_cube_with_name(cube_name).is_some() {
+            MetaContext::is_synthetic_field_name(member_name)
         } else {
             false
         }
@@ -193,22 +184,24 @@ impl MetaContext {
         field_name == "__user" || field_name == "__cubeJoinField"
     }
 
-    pub fn find_df_data_type(&self, member_name: String) -> Option<DataType> {
-        self.find_cube_with_name(member_name.split(".").next()?)?
-            .df_data_type(member_name.as_str())
+    pub fn find_df_data_type(&self, member_name: &str) -> Option<DataType> {
+        let (cube_name, _) = member_name.split_once(".")?;
+
+        self.find_cube_with_name(cube_name)?
+            .df_data_type(member_name)
     }
 
-    pub fn find_cube_table_with_oid(&self, oid: u32) -> Option<CubeMetaTable> {
-        self.tables.iter().find(|table| table.oid == oid).cloned()
+    pub fn find_cube_table_with_oid(&self, oid: u32) -> Option<&CubeMetaTable> {
+        self.tables.iter().find(|table| table.oid == oid)
     }
 
-    pub fn find_cube_table_with_name(&self, name: String) -> Option<CubeMetaTable> {
-        self.tables.iter().find(|table| table.name == name).cloned()
+    pub fn find_cube_table_with_name(&self, name: &str) -> Option<&CubeMetaTable> {
+        self.tables.iter().find(|table| table.name == name)
     }
 
-    pub fn cube_has_join(&self, cube_name: &str, join_name: String) -> bool {
+    pub fn cube_has_join(&self, cube_name: &str, join_name: &str) -> bool {
         if let Some(cube) = self.find_cube_with_name(cube_name) {
-            if let Some(joins) = cube.joins {
+            if let Some(joins) = &cube.joins {
                 return joins.iter().any(|j| j.name == join_name);
             }
         }
@@ -235,6 +228,7 @@ mod tests {
                 segments: vec![],
                 joins: None,
                 folders: None,
+                hierarchies: None,
                 meta: None,
             },
             CubeMeta {
@@ -247,6 +241,7 @@ mod tests {
                 segments: vec![],
                 joins: None,
                 folders: None,
+                hierarchies: None,
                 meta: None,
             },
         ];
@@ -260,7 +255,7 @@ mod tests {
             _ => panic!("wrong oid!"),
         }
 
-        match test_context.find_cube_table_with_name("test2".to_string()) {
+        match test_context.find_cube_table_with_name("test2") {
             Some(table) => assert_eq!(18005, table.oid),
             _ => panic!("wrong name!"),
         }
diff --git a/rust/cubesql/cubesql/src/transport/mod.rs b/rust/cubesql/cubesql/src/transport/mod.rs
index 4e41032022..4f2afe3443 100644
--- a/rust/cubesql/cubesql/src/transport/mod.rs
+++ b/rust/cubesql/cubesql/src/transport/mod.rs
@@ -10,6 +10,7 @@ pub type CubeMetaMeasure = cubeclient::models::V1CubeMetaMeasure;
 pub type CubeMetaSegment = cubeclient::models::V1CubeMetaSegment;
 pub type CubeMetaJoin = cubeclient::models::V1CubeMetaJoin;
 pub type CubeMetaFolder = cubeclient::models::V1CubeMetaFolder;
+pub type CubeMetaHierarchy = cubeclient::models::V1CubeMetaHierarchy;
 // Request/Response
 pub type TransportLoadResponse = cubeclient::models::V1LoadResponse;
 pub type TransportLoadRequestQuery = cubeclient::models::V1LoadRequestQuery;
diff --git a/rust/cubesql/cubesql/src/transport/service.rs b/rust/cubesql/cubesql/src/transport/service.rs
index 85d9d27091..93bef66638 100644
--- a/rust/cubesql/cubesql/src/transport/service.rs
+++ b/rust/cubesql/cubesql/src/transport/service.rs
@@ -418,7 +418,7 @@ impl SqlTemplates {
             .iter()
             .chain(aggregate.iter())
             .chain(projection.iter())
-            .map(|c| c.clone())
+            .cloned()
             .collect::<Vec<_>>();
         let quoted_from_alias = self.quote_identifier(&alias)?;
         let has_grouping_sets = group_descs.iter().any(|d| d.is_some());
diff --git a/rust/cubesql/package.json b/rust/cubesql/package.json
index c744e0d653..dea74fccbe 100644
--- a/rust/cubesql/package.json
+++ b/rust/cubesql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-backend/cubesql",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "description": "SQL API for Cube as proxy over MySQL protocol.",
   "engines": {
     "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
diff --git a/rust/cubesql/pg-srv/Cargo.toml b/rust/cubesql/pg-srv/Cargo.toml
index 816d7612af..4967ef2699 100644
--- a/rust/cubesql/pg-srv/Cargo.toml
+++ b/rust/cubesql/pg-srv/Cargo.toml
@@ -18,7 +18,7 @@ async-trait = "0.1.36"
 log = "0.4"
 bytes = "1.2"
 byteorder = "1.4"
-thiserror = "1.0.50"
+thiserror = "2"
 chrono = { version = "0.4", package = "chrono", default-features = false, features = [
     "clock",
 ], optional = true }
diff --git a/rust/cubesql/pg-srv/src/lib.rs b/rust/cubesql/pg-srv/src/lib.rs
index 5642012065..bc34adc813 100644
--- a/rust/cubesql/pg-srv/src/lib.rs
+++ b/rust/cubesql/pg-srv/src/lib.rs
@@ -2,10 +2,6 @@
 //! You can find overview of the protocol at
 //! <https://www.postgresql.org/docs/10/protocol.html>
 
-// #![feature(backtrace)]
-// #![feature(type_ascription)]
-#![feature(error_generic_member_access)]
-
 mod decoding;
 mod encoding;
 
@@ -20,25 +16,51 @@ pub use encoding::*;
 pub use extended::*;
 pub use pg_type::*;
 
-use std::backtrace::Backtrace;
+use std::{backtrace::Backtrace, fmt::Formatter};
 
 /// Protocol error abstract of handled/unhandled errors, it should not handle any kind of business logic errors
-#[derive(thiserror::Error, Debug)]
+/// TODO: Migrate back to thiserror crate, when Rust will stabilize feature(error_generic_member_access)
+#[derive(Debug)]
 pub enum ProtocolError {
-    #[error("IO Error: {}", .source)]
     IO {
-        #[from]
         source: std::io::Error,
         backtrace: Backtrace,
     },
-    #[error("Error: {}", .source.message)]
     ErrorResponse {
-        #[from]
         source: protocol::ErrorResponse,
         backtrace: Backtrace,
     },
 }
 
+impl std::fmt::Display for ProtocolError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ProtocolError::IO { source, .. } => f.write_fmt(format_args!("IO error: {}", source)),
+            ProtocolError::ErrorResponse { source, .. } => {
+                f.write_fmt(format_args!("Error: {}", source.message))
+            }
+        }
+    }
+}
+
+impl From<std::io::Error> for ProtocolError {
+    fn from(source: std::io::Error) -> Self {
+        ProtocolError::IO {
+            source,
+            backtrace: Backtrace::capture(),
+        }
+    }
+}
+
+impl From<protocol::ErrorResponse> for ProtocolError {
+    fn from(source: protocol::ErrorResponse) -> Self {
+        ProtocolError::ErrorResponse {
+            source,
+            backtrace: Backtrace::capture(),
+        }
+    }
+}
+
 impl ProtocolError {
     /// Return Backtrace from any variant of Enum
     pub fn backtrace(&self) -> Option<&Backtrace> {
diff --git a/rust/cubesql/pg-srv/src/pg_type.rs b/rust/cubesql/pg-srv/src/pg_type.rs
index d98b7cac65..9bf97de13d 100644
--- a/rust/cubesql/pg-srv/src/pg_type.rs
+++ b/rust/cubesql/pg-srv/src/pg_type.rs
@@ -31,7 +31,7 @@ pub struct PgType<'a> {
     pub typreceive_oid: u32,
 }
 
-impl<'a> PgType<'a> {
+impl PgType<'_> {
     pub fn get_typinput(&self) -> String {
         if let Some(ty_id) = PgTypeId::from_oid(self.oid) {
             // TODO: It requires additional verification
diff --git a/rust/cubesql/rust-toolchain.toml b/rust/cubesql/rust-toolchain.toml
index 2b415db8a5..d9f5179de3 100644
--- a/rust/cubesql/rust-toolchain.toml
+++ b/rust/cubesql/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2024-07-15"
+channel = "1.84.1"
 components = ["rustfmt", "clippy"]
 profile = "minimal"
diff --git a/rust/cubesql/rustfmt.toml b/rust/cubesql/rustfmt.toml
index d9ba5fdb90..be16682302 100644
--- a/rust/cubesql/rustfmt.toml
+++ b/rust/cubesql/rustfmt.toml
@@ -1 +1,2 @@
-imports_granularity = "Crate"
\ No newline at end of file
+# TODO: Uncomment, when it will become stable in rustfmt - https://github.com/rust-lang/rustfmt/issues/4991
+# imports_granularity = "Crate"
\ No newline at end of file
diff --git a/rust/cubesqlplanner/Cargo.lock b/rust/cubesqlplanner/Cargo.lock
index c2732a97ce..e6ceccebb3 100644
--- a/rust/cubesqlplanner/Cargo.lock
+++ b/rust/cubesqlplanner/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "Inflector"
@@ -44,7 +44,7 @@ version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -214,7 +214,7 @@ checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
@@ -303,7 +303,7 @@ dependencies = [
  "arrayref",
  "arrayvec",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "constant_time_eq",
 ]
 
@@ -422,12 +422,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -442,9 +436,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -577,7 +571,7 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -709,7 +703,6 @@ dependencies = [
 name = "cubesql"
 version = "0.28.0"
 dependencies = [
- "anyhow",
  "arc-swap",
  "async-stream",
  "async-trait",
@@ -717,12 +710,10 @@ dependencies = [
  "bigdecimal",
  "bincode",
  "bitflags 1.3.2",
- "byteorder",
  "bytes",
  "chrono",
  "chrono-tz 0.6.3",
  "comfy-table 7.1.1",
- "csv",
  "cubeclient",
  "datafusion",
  "egg",
@@ -731,11 +722,10 @@ dependencies = [
  "futures-util",
  "hashbrown 0.14.5",
  "indexmap 1.9.3",
- "itertools",
+ "itertools 0.14.0",
  "log",
  "lru",
  "minijinja",
- "mockall",
  "paste",
  "pg-srv",
  "postgres-types",
@@ -747,10 +737,9 @@ dependencies = [
  "sha1_smol",
  "sha2",
  "simple_logger",
- "smallvec",
  "sqlparser",
  "tera",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tokio-util",
  "tracing",
@@ -768,7 +757,7 @@ dependencies = [
  "cubeclient",
  "cubenativeutils",
  "datafusion",
- "itertools",
+ "itertools 0.10.5",
  "lazy_static",
  "minijinja",
  "nativebridge",
@@ -794,7 +783,7 @@ dependencies = [
  "datafusion-physical-expr",
  "futures",
  "hashbrown 0.12.3",
- "itertools",
+ "itertools 0.10.5",
  "lazy_static",
  "log",
  "num_cpus",
@@ -871,12 +860,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "difference"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -888,12 +871,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "downcast"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb454f0228b18c7f4c3b0ebbee346ed9c52e7443b0999cd543ff3571205701d"
-
 [[package]]
 name = "egg"
 version = "0.9.5"
@@ -912,7 +889,7 @@ dependencies = [
  "smallvec",
  "symbol_table",
  "symbolic_expressions",
- "thiserror",
+ "thiserror 1.0.61",
  "vectorize",
 ]
 
@@ -988,7 +965,7 @@ checksum = "86b428b715fdbdd1c364b84573b5fdc0f84f8e423661b9f398735278bc7f2b6a"
 dependencies = [
  "bitflags 1.3.2",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.61",
 ]
 
 [[package]]
@@ -1001,21 +978,18 @@ dependencies = [
  "miniz_oxide",
 ]
 
-[[package]]
-name = "float-cmp"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -1025,21 +999,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fragile"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7464c5c4a3f014d9b2ec4073650e5c06596f385060af740fc45ad5a19f959e8"
-dependencies = [
- "fragile 2.0.0",
-]
-
-[[package]]
-name = "fragile"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -1160,7 +1119,7 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "wasi",
 ]
@@ -1221,6 +1180,17 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -1439,7 +1409,7 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -1474,6 +1444,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -1580,7 +1559,7 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "windows-targets 0.52.6",
 ]
 
@@ -1614,11 +1593,11 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lru"
-version = "0.12.3"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
+checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -1647,7 +1626,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "digest",
 ]
 
@@ -1711,33 +1690,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "mockall"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cabea45a7fc0e37093f4f30a5e2b62602253f91791c057d5f0470c63260c3d"
-dependencies = [
- "cfg-if 0.1.10",
- "downcast",
- "fragile 1.2.2",
- "lazy_static",
- "mockall_derive",
- "predicates",
- "predicates-tree",
-]
-
-[[package]]
-name = "mockall_derive"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c461918bf7f59eefb1459252756bf2351a995d6bd510d0b2061bd86bcdabfa6"
-dependencies = [
- "cfg-if 0.1.10",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "multiversion"
 version = "0.6.1"
@@ -1765,7 +1717,7 @@ dependencies = [
  "Inflector",
  "async-trait",
  "byteorder",
- "itertools",
+ "itertools 0.10.5",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -1797,12 +1749,6 @@ dependencies = [
  "syn-mid",
 ]
 
-[[package]]
-name = "normalize-line-endings"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
-
 [[package]]
 name = "num"
 version = "0.4.3"
@@ -1941,7 +1887,7 @@ version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
@@ -2006,7 +1952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
 dependencies = [
  "memchr",
- "thiserror",
+ "thiserror 1.0.61",
  "ucd-trie",
 ]
 
@@ -2053,7 +1999,7 @@ dependencies = [
  "bytes",
  "chrono",
  "log",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
 ]
 
@@ -2169,35 +2115,6 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
-[[package]]
-name = "predicates"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df"
-dependencies = [
- "difference",
- "float-cmp",
- "normalize-line-endings",
- "predicates-core",
- "regex",
-]
-
-[[package]]
-name = "predicates-core"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
-
-[[package]]
-name = "predicates-tree"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
-dependencies = [
- "predicates-core",
- "termtree",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "3.1.0"
@@ -2271,7 +2188,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls",
- "thiserror",
+ "thiserror 1.0.61",
  "tokio",
  "tracing",
 ]
@@ -2288,7 +2205,7 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "slab",
- "thiserror",
+ "thiserror 1.0.61",
  "tinyvec",
  "tracing",
 ]
@@ -2457,7 +2374,7 @@ dependencies = [
  "http",
  "reqwest",
  "serde",
- "thiserror",
+ "thiserror 1.0.61",
  "tower-service",
 ]
 
@@ -2468,7 +2385,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "getrandom",
  "libc",
  "spin",
@@ -2702,7 +2619,7 @@ version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest",
 ]
@@ -2927,7 +2844,7 @@ version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fastrand",
  "rustix",
  "windows-sys 0.52.0",
@@ -2950,18 +2867,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "termtree"
-version = "0.4.1"
+name = "thiserror"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl 1.0.61",
+]
 
 [[package]]
 name = "thiserror"
-version = "1.0.61"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 2.0.11",
 ]
 
 [[package]]
@@ -2975,6 +2895,17 @@ dependencies = [
  "syn 2.0.95",
 ]
 
+[[package]]
+name = "thiserror-impl"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+]
+
 [[package]]
 name = "threadpool"
 version = "1.8.1"
@@ -3361,7 +3292,7 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "wasm-bindgen-macro",
 ]
 
@@ -3386,7 +3317,7 @@ version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -3634,7 +3565,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "windows-sys 0.48.0",
 ]
 
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/base_query_options.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/base_query_options.rs
index 2e0571cfa0..e5d75e4fab 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/base_query_options.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/base_query_options.rs
@@ -1,11 +1,11 @@
 use super::join_graph::{JoinGraph, NativeJoinGraph};
+use super::options_member::OptionsMember;
 use crate::cube_bridge::base_tools::{BaseTools, NativeBaseTools};
 use crate::cube_bridge::evaluator::{CubeEvaluator, NativeCubeEvaluator};
 use cubenativeutils::wrappers::serializer::{
     NativeDeserialize, NativeDeserializer, NativeSerialize,
 };
-use cubenativeutils::wrappers::NativeContextHolder;
-use cubenativeutils::wrappers::NativeObjectHandle;
+use cubenativeutils::wrappers::{NativeArray, NativeContextHolder, NativeObjectHandle};
 use cubenativeutils::CubeError;
 use serde::{Deserialize, Serialize};
 use std::any::Any;
@@ -50,7 +50,6 @@ impl FilterItem {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct BaseQueryOptionsStatic {
     pub measures: Option<Vec<String>>,
-    pub dimensions: Option<Vec<String>>,
     #[serde(rename = "timeDimensions")]
     pub time_dimensions: Option<Vec<TimeDimension>>,
     pub timezone: Option<String>,
@@ -66,9 +65,13 @@ pub struct BaseQueryOptionsStatic {
 #[nativebridge::native_bridge(BaseQueryOptionsStatic)]
 pub trait BaseQueryOptions {
     #[field]
-    fn measures(&self) -> Result<Option<Vec<String>>, CubeError>;
+    #[optional]
+    #[vec]
+    fn measures(&self) -> Result<Option<Vec<OptionsMember>>, CubeError>;
     #[field]
-    fn dimensions(&self) -> Result<Option<Vec<String>>, CubeError>;
+    #[optional]
+    #[vec]
+    fn dimensions(&self) -> Result<Option<Vec<OptionsMember>>, CubeError>;
     #[field]
     fn cube_evaluator(&self) -> Result<Rc<dyn CubeEvaluator>, CubeError>;
     #[field]
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/base_tools.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/base_tools.rs
index ded10dda2e..0ccc1567be 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/base_tools.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/base_tools.rs
@@ -1,8 +1,9 @@
 use super::filter_group::{FilterGroup, NativeFilterGroup};
 use super::filter_params::{FilterParams, NativeFilterParams};
-use super::memeber_sql::{MemberSql, NativeMemberSql};
+use super::member_sql::{MemberSql, NativeMemberSql};
 use super::security_context::{NativeSecurityContext, SecurityContext};
 use super::sql_templates_render::{NativeSqlTemplatesRender, SqlTemplatesRender};
+use super::sql_utils::{NativeSqlUtils, SqlUtils};
 use cubenativeutils::wrappers::serializer::{
     NativeDeserialize, NativeDeserializer, NativeSerialize,
 };
@@ -34,6 +35,7 @@ pub trait BaseTools {
         sql: Rc<dyn MemberSql>,
     ) -> Result<Vec<CallDep>, CubeError>;
     fn security_context_for_rust(&self) -> Result<Rc<dyn SecurityContext>, CubeError>;
+    fn sql_utils_for_rust(&self) -> Result<Rc<dyn SqlUtils>, CubeError>;
     fn filters_proxy(&self) -> Result<Rc<dyn FilterParams>, CubeError>;
     fn filter_group_function(&self) -> Result<Rc<dyn FilterGroup>, CubeError>;
     fn timestamp_precision(&self) -> Result<u32, CubeError>;
@@ -45,4 +47,9 @@ pub trait BaseTools {
     ) -> Result<Vec<Vec<String>>, CubeError>;
     fn get_allocated_params(&self) -> Result<Vec<String>, CubeError>;
     fn all_cube_members(&self, path: String) -> Result<Vec<String>, CubeError>;
+    //===== TODO Move to templates
+    fn hll_init(&self, sql: String) -> Result<String, CubeError>;
+    fn hll_merge(&self, sql: String) -> Result<String, CubeError>;
+    fn hll_cardinality_merge(&self, sql: String) -> Result<String, CubeError>;
+    fn count_distinct_approx(&self, sql: String) -> Result<String, CubeError>;
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/cube_definition.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/cube_definition.rs
index 6fa531ddbc..c8d9d9ef76 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/cube_definition.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/cube_definition.rs
@@ -1,4 +1,4 @@
-use super::memeber_sql::{MemberSql, NativeMemberSql};
+use super::member_sql::{MemberSql, NativeMemberSql};
 use cubenativeutils::wrappers::serializer::{
     NativeDeserialize, NativeDeserializer, NativeSerialize,
 };
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/dimension_definition.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/dimension_definition.rs
index c4936c3125..6ca6e193ed 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/dimension_definition.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/dimension_definition.rs
@@ -1,4 +1,5 @@
-use super::memeber_sql::{MemberSql, NativeMemberSql};
+use super::geo_item::{GeoItem, NativeGeoItem};
+use super::member_sql::{MemberSql, NativeMemberSql};
 use cubenativeutils::wrappers::serializer::{
     NativeDeserialize, NativeDeserializer, NativeSerialize,
 };
@@ -17,10 +18,23 @@ pub struct DimenstionDefinitionStatic {
     pub owned_by_cube: Option<bool>,
     #[serde(rename = "multiStage")]
     pub multi_stage: Option<bool>,
+    #[serde(rename = "subQuery")]
+    pub sub_query: Option<bool>,
+    #[serde(rename = "propagateFiltersToSubQuery")]
+    pub propagate_filters_to_sub_query: Option<bool>,
 }
 
 #[nativebridge::native_bridge(DimenstionDefinitionStatic)]
 pub trait DimensionDefinition {
+    #[optional]
     #[field]
-    fn sql(&self) -> Result<Rc<dyn MemberSql>, CubeError>;
+    fn sql(&self) -> Result<Option<Rc<dyn MemberSql>>, CubeError>;
+
+    #[optional]
+    #[field]
+    fn latitude(&self) -> Result<Option<Rc<dyn GeoItem>>, CubeError>;
+
+    #[optional]
+    #[field]
+    fn longitude(&self) -> Result<Option<Rc<dyn GeoItem>>, CubeError>;
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/evaluator.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/evaluator.rs
index f076c1eb7c..7c02a6f7a0 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/evaluator.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/evaluator.rs
@@ -1,7 +1,7 @@
 use super::cube_definition::{CubeDefinition, NativeCubeDefinition};
 use super::dimension_definition::{DimensionDefinition, NativeDimensionDefinition};
 use super::measure_definition::{MeasureDefinition, NativeMeasureDefinition};
-use super::memeber_sql::{MemberSql, NativeMemberSql};
+use super::member_sql::{MemberSql, NativeMemberSql};
 use cubenativeutils::wrappers::serializer::{
     NativeDeserialize, NativeDeserializer, NativeSerialize,
 };
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/geo_item.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/geo_item.rs
new file mode 100644
index 0000000000..8742686db9
--- /dev/null
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/geo_item.rs
@@ -0,0 +1,15 @@
+use super::member_sql::{MemberSql, NativeMemberSql};
+use cubenativeutils::wrappers::serializer::{
+    NativeDeserialize, NativeDeserializer, NativeSerialize,
+};
+use cubenativeutils::wrappers::NativeContextHolder;
+use cubenativeutils::wrappers::NativeObjectHandle;
+use cubenativeutils::CubeError;
+use std::any::Any;
+use std::rc::Rc;
+
+#[nativebridge::native_bridge]
+pub trait GeoItem {
+    #[field]
+    fn sql(&self) -> Result<Rc<dyn MemberSql>, CubeError>;
+}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_definition.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_definition.rs
index c224661d2a..020b3dd6b8 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_definition.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_definition.rs
@@ -1,7 +1,8 @@
-use super::join_item::{JoinItemsVec, NativeJoinItemsVec};
+use super::join_item::{JoinItem, NativeJoinItem};
 use cubenativeutils::wrappers::serializer::{
     NativeDeserialize, NativeDeserializer, NativeSerialize,
 };
+use cubenativeutils::wrappers::NativeArray;
 use cubenativeutils::wrappers::NativeContextHolder;
 use cubenativeutils::wrappers::NativeObjectHandle;
 use cubenativeutils::CubeError;
@@ -20,5 +21,6 @@ pub struct JoinDefinitionStatic {
 #[nativebridge::native_bridge(JoinDefinitionStatic)]
 pub trait JoinDefinition {
     #[field]
-    fn joins(&self) -> Result<Rc<dyn JoinItemsVec>, CubeError>;
+    #[vec]
+    fn joins(&self) -> Result<Vec<Rc<dyn JoinItem>>, CubeError>;
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_graph.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_graph.rs
index bb8f1c1227..32b7760610 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_graph.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_graph.rs
@@ -1,4 +1,5 @@
 use super::join_definition::{JoinDefinition, NativeJoinDefinition};
+use super::join_hints::JoinHintItem;
 use cubenativeutils::wrappers::serializer::{
     NativeDeserialize, NativeDeserializer, NativeSerialize,
 };
@@ -10,5 +11,8 @@ use std::rc::Rc;
 
 #[nativebridge::native_bridge]
 pub trait JoinGraph {
-    fn build_join(&self, cubes_to_join: Vec<String>) -> Result<Rc<dyn JoinDefinition>, CubeError>;
+    fn build_join(
+        &self,
+        cubes_to_join: Vec<JoinHintItem>,
+    ) -> Result<Rc<dyn JoinDefinition>, CubeError>;
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_hints.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_hints.rs
new file mode 100644
index 0000000000..a3ef5d4044
--- /dev/null
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_hints.rs
@@ -0,0 +1,7 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)]
+pub enum JoinHintItem {
+    Single(String),
+    Vector(Vec<String>),
+}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_item.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_item.rs
index f3130d0ec7..c712cd3c06 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_item.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_item.rs
@@ -1,5 +1,4 @@
 use super::join_item_definition::{JoinItemDefinition, NativeJoinItemDefinition};
-use cubenativeutils::wrappers::object::NativeArray;
 use cubenativeutils::wrappers::serializer::{
     NativeDeserialize, NativeDeserializer, NativeSerialize,
 };
@@ -8,7 +7,6 @@ use cubenativeutils::wrappers::NativeObjectHandle;
 use cubenativeutils::CubeError;
 use serde::{Deserialize, Serialize};
 use std::any::Any;
-use std::marker::PhantomData;
 use std::rc::Rc;
 
 #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq, Hash)]
@@ -26,41 +24,3 @@ pub trait JoinItem {
     #[field]
     fn join(&self) -> Result<Rc<dyn JoinItemDefinition>, CubeError>;
 }
-
-pub trait JoinItemsVec {
-    fn items(&self) -> &Vec<Rc<dyn JoinItem>>;
-}
-
-pub struct NativeJoinItemsVec<IT: InnerTypes> {
-    items: Vec<Rc<dyn JoinItem>>,
-    phantom: PhantomData<IT>,
-}
-
-impl<IT: InnerTypes> NativeJoinItemsVec<IT> {
-    pub fn try_new(native_items: NativeObjectHandle<IT>) -> Result<Self, CubeError> {
-        let items = native_items
-            .into_array()?
-            .to_vec()?
-            .into_iter()
-            .map(|v| -> Result<Rc<dyn JoinItem>, CubeError> {
-                Ok(Rc::new(NativeJoinItem::from_native(v)?))
-            })
-            .collect::<Result<Vec<_>, _>>()?;
-        Ok(Self {
-            items,
-            phantom: PhantomData::default(),
-        })
-    }
-}
-
-impl<IT: InnerTypes> JoinItemsVec for NativeJoinItemsVec<IT> {
-    fn items(&self) -> &Vec<Rc<dyn JoinItem>> {
-        &self.items
-    }
-}
-
-impl<IT: InnerTypes> NativeDeserialize<IT> for NativeJoinItemsVec<IT> {
-    fn from_native(v: NativeObjectHandle<IT>) -> Result<Self, CubeError> {
-        Self::try_new(v)
-    }
-}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_item_definition.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_item_definition.rs
index 2f532e3b7e..cca8d2cce7 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_item_definition.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_item_definition.rs
@@ -1,4 +1,4 @@
-use super::memeber_sql::{MemberSql, NativeMemberSql};
+use super::member_sql::{MemberSql, NativeMemberSql};
 use cubenativeutils::wrappers::serializer::{
     NativeDeserialize, NativeDeserializer, NativeSerialize,
 };
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/measure_definition.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/measure_definition.rs
index 4c1cdb21f2..54329c7738 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/measure_definition.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/measure_definition.rs
@@ -1,10 +1,11 @@
 use super::cube_definition::{CubeDefinition, NativeCubeDefinition};
-use super::measure_filter::{MeasureFiltersVec, NativeMeasureFiltersVec};
-use super::member_order_by::{MemberOrderByVec, NativeMemberOrderByVec};
-use super::memeber_sql::{MemberSql, NativeMemberSql};
+use super::measure_filter::{MeasureFilter, NativeMeasureFilter};
+use super::member_order_by::{MemberOrderBy, NativeMemberOrderBy};
+use super::member_sql::{MemberSql, NativeMemberSql};
 use cubenativeutils::wrappers::serializer::{
     NativeDeserialize, NativeDeserializer, NativeSerialize,
 };
+use cubenativeutils::wrappers::NativeArray;
 use cubenativeutils::wrappers::NativeContextHolder;
 use cubenativeutils::wrappers::NativeObjectHandle;
 use cubenativeutils::CubeError;
@@ -26,6 +27,9 @@ pub struct RollingWindow {
     pub trailing: Option<String>,
     pub leading: Option<String>,
     pub offset: Option<String>,
+    #[serde(rename = "type")]
+    pub rolling_type: Option<String>,
+    pub granularity: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -58,9 +62,16 @@ pub trait MeasureDefinition {
 
     #[optional]
     #[field]
-    fn filters(&self) -> Result<Option<Rc<dyn MeasureFiltersVec>>, CubeError>;
+    #[vec]
+    fn filters(&self) -> Result<Option<Vec<Rc<dyn MeasureFilter>>>, CubeError>;
+
+    #[optional]
+    #[field]
+    #[vec]
+    fn drill_filters(&self) -> Result<Option<Vec<Rc<dyn MeasureFilter>>>, CubeError>;
 
     #[optional]
     #[field]
-    fn order_by(&self) -> Result<Option<Rc<dyn MemberOrderByVec>>, CubeError>;
+    #[vec]
+    fn order_by(&self) -> Result<Option<Vec<Rc<dyn MemberOrderBy>>>, CubeError>;
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/measure_filter.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/measure_filter.rs
index a7973e0c60..500774e50b 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/measure_filter.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/measure_filter.rs
@@ -1,5 +1,4 @@
-use super::memeber_sql::{MemberSql, NativeMemberSql};
-use cubenativeutils::wrappers::object::NativeArray;
+use super::member_sql::{MemberSql, NativeMemberSql};
 use cubenativeutils::wrappers::serializer::{
     NativeDeserialize, NativeDeserializer, NativeSerialize,
 };
@@ -7,7 +6,6 @@ use cubenativeutils::wrappers::NativeContextHolder;
 use cubenativeutils::wrappers::NativeObjectHandle;
 use cubenativeutils::CubeError;
 use std::any::Any;
-use std::marker::PhantomData;
 use std::rc::Rc;
 
 #[nativebridge::native_bridge]
@@ -15,41 +13,3 @@ pub trait MeasureFilter {
     #[field]
     fn sql(&self) -> Result<Rc<dyn MemberSql>, CubeError>;
 }
-
-pub trait MeasureFiltersVec {
-    fn items(&self) -> &Vec<Rc<dyn MeasureFilter>>;
-}
-
-pub struct NativeMeasureFiltersVec<IT: InnerTypes> {
-    items: Vec<Rc<dyn MeasureFilter>>,
-    phantom: PhantomData<IT>,
-}
-
-impl<IT: InnerTypes> NativeMeasureFiltersVec<IT> {
-    pub fn try_new(native_items: NativeObjectHandle<IT>) -> Result<Self, CubeError> {
-        let items = native_items
-            .into_array()?
-            .to_vec()?
-            .into_iter()
-            .map(|v| -> Result<Rc<dyn MeasureFilter>, CubeError> {
-                Ok(Rc::new(NativeMeasureFilter::from_native(v)?))
-            })
-            .collect::<Result<Vec<_>, _>>()?;
-        Ok(Self {
-            items,
-            phantom: PhantomData::default(),
-        })
-    }
-}
-
-impl<IT: InnerTypes> MeasureFiltersVec for NativeMeasureFiltersVec<IT> {
-    fn items(&self) -> &Vec<Rc<dyn MeasureFilter>> {
-        &self.items
-    }
-}
-
-impl<IT: InnerTypes> NativeDeserialize<IT> for NativeMeasureFiltersVec<IT> {
-    fn from_native(v: NativeObjectHandle<IT>) -> Result<Self, CubeError> {
-        Self::try_new(v)
-    }
-}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_definition.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_definition.rs
index 52d88dfb0c..a0b8297148 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_definition.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_definition.rs
@@ -1,4 +1,4 @@
-use super::memeber_sql::{MemberSql, NativeMemberSql};
+use super::member_sql::{MemberSql, NativeMemberSql};
 use cubenativeutils::wrappers::serializer::{
     NativeDeserialize, NativeDeserializer, NativeSerialize,
 };
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_expression.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_expression.rs
new file mode 100644
index 0000000000..45d2a26dde
--- /dev/null
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_expression.rs
@@ -0,0 +1,24 @@
+use super::member_sql::{MemberSql, NativeMemberSql};
+use cubenativeutils::wrappers::serializer::{
+    NativeDeserialize, NativeDeserializer, NativeSerialize,
+};
+use cubenativeutils::wrappers::{NativeContextHolder, NativeObjectHandle};
+use cubenativeutils::CubeError;
+use serde::{Deserialize, Serialize};
+use std::any::Any;
+use std::rc::Rc;
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct MemberExpressionDefinitionStatic {
+    #[serde(rename = "expressionName")]
+    pub expression_name: Option<String>,
+    #[serde(rename = "cubeName")]
+    pub cube_name: Option<String>,
+    pub definition: Option<String>,
+}
+
+#[nativebridge::native_bridge(MemberExpressionDefinitionStatic)]
+pub trait MemberExpressionDefinition {
+    #[field]
+    fn expression(&self) -> Result<Rc<dyn MemberSql>, CubeError>;
+}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_order_by.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_order_by.rs
index 56905aa825..0f56aeafc4 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_order_by.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_order_by.rs
@@ -1,5 +1,4 @@
-use super::memeber_sql::{MemberSql, NativeMemberSql};
-use cubenativeutils::wrappers::object::NativeArray;
+use super::member_sql::{MemberSql, NativeMemberSql};
 use cubenativeutils::wrappers::serializer::{
     NativeDeserialize, NativeDeserializer, NativeSerialize,
 };
@@ -7,7 +6,6 @@ use cubenativeutils::wrappers::NativeContextHolder;
 use cubenativeutils::wrappers::NativeObjectHandle;
 use cubenativeutils::CubeError;
 use std::any::Any;
-use std::marker::PhantomData;
 use std::rc::Rc;
 
 #[nativebridge::native_bridge]
@@ -17,41 +15,3 @@ pub trait MemberOrderBy {
     #[field]
     fn dir(&self) -> Result<String, CubeError>;
 }
-
-pub trait MemberOrderByVec {
-    fn items(&self) -> &Vec<Rc<dyn MemberOrderBy>>;
-}
-
-pub struct NativeMemberOrderByVec<IT: InnerTypes> {
-    items: Vec<Rc<dyn MemberOrderBy>>,
-    phantom: PhantomData<IT>,
-}
-
-impl<IT: InnerTypes> NativeMemberOrderByVec<IT> {
-    pub fn try_new(native_items: NativeObjectHandle<IT>) -> Result<Self, CubeError> {
-        let items = native_items
-            .into_array()?
-            .to_vec()?
-            .into_iter()
-            .map(|v| -> Result<Rc<dyn MemberOrderBy>, CubeError> {
-                Ok(Rc::new(NativeMemberOrderBy::from_native(v)?))
-            })
-            .collect::<Result<Vec<_>, _>>()?;
-        Ok(Self {
-            items,
-            phantom: PhantomData::default(),
-        })
-    }
-}
-
-impl<IT: InnerTypes> MemberOrderByVec for NativeMemberOrderByVec<IT> {
-    fn items(&self) -> &Vec<Rc<dyn MemberOrderBy>> {
-        &self.items
-    }
-}
-
-impl<IT: InnerTypes> NativeDeserialize<IT> for NativeMemberOrderByVec<IT> {
-    fn from_native(v: NativeObjectHandle<IT>) -> Result<Self, CubeError> {
-        Self::try_new(v)
-    }
-}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/memeber_sql.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_sql.rs
similarity index 78%
rename from rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/memeber_sql.rs
rename to rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_sql.rs
index 3dbf3a967f..993fd76dc8 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/memeber_sql.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_sql.rs
@@ -2,6 +2,7 @@ use super::{
     filter_group::{FilterGroup, NativeFilterGroup},
     filter_params::{FilterParams, NativeFilterParams},
     security_context::{NativeSecurityContext, SecurityContext},
+    sql_utils::{NativeSqlUtils, SqlUtils},
 };
 use cubenativeutils::wrappers::inner_types::InnerTypes;
 use cubenativeutils::wrappers::object::{NativeFunction, NativeStruct, NativeType};
@@ -24,6 +25,7 @@ pub struct MemberSqlStruct {
 
 pub enum ContextSymbolArg {
     SecurityContext(Rc<dyn SecurityContext>),
+    SqlUtils(Rc<dyn SqlUtils>),
     FilterParams(Rc<dyn FilterParams>),
     FilterGroup(Rc<dyn FilterGroup>),
 }
@@ -37,9 +39,39 @@ pub enum MemberSqlArg {
 pub trait MemberSql {
     fn call(&self, args: Vec<MemberSqlArg>) -> Result<String, CubeError>;
     fn args_names(&self) -> &Vec<String>;
+    fn need_deps_resolve(&self) -> bool;
     fn as_any(self: Rc<Self>) -> Rc<dyn Any>;
 }
 
+pub struct CustomMemberSql {
+    sql: String,
+    args_names: Vec<String>,
+}
+
+impl CustomMemberSql {
+    pub fn new(sql: String) -> Rc<Self> {
+        Rc::new(Self {
+            sql,
+            args_names: vec![],
+        })
+    }
+}
+
+impl MemberSql for CustomMemberSql {
+    fn call(&self, _args: Vec<MemberSqlArg>) -> Result<String, CubeError> {
+        Ok(self.sql.clone())
+    }
+    fn args_names(&self) -> &Vec<String> {
+        &self.args_names
+    }
+    fn need_deps_resolve(&self) -> bool {
+        false
+    }
+    fn as_any(self: Rc<Self>) -> Rc<dyn Any> {
+        self.clone()
+    }
+}
+
 pub struct NativeMemberSql<IT: InnerTypes> {
     native_object: NativeObjectHandle<IT>,
     args_names: Vec<String>,
@@ -50,14 +82,20 @@ impl<IT: InnerTypes> NativeSerialize<IT> for MemberSqlStruct {
         &self,
         context: NativeContextHolder<IT>,
     ) -> Result<NativeObjectHandle<IT>, CubeError> {
-        let res = context.empty_struct();
+        let res = context.empty_struct()?;
         for (k, v) in self.properties.iter() {
             res.set_field(k, v.to_native(context.clone())?)?;
         }
         if let Some(to_string_fn) = &self.to_string_fn {
             res.set_field(
                 "toString",
-                NativeObjectHandle::new(context.to_string_fn(to_string_fn.clone()).into_object()),
+                NativeObjectHandle::new(context.to_string_fn(to_string_fn.clone())?.into_object()),
+            )?;
+        }
+        if let Some(sql_fn) = &self.sql_fn {
+            res.set_field(
+                "sql",
+                NativeObjectHandle::new(context.to_string_fn(sql_fn.clone())?.into_object()),
             )?;
         }
         Ok(NativeObjectHandle::new(res.into_object()))
@@ -79,6 +117,12 @@ impl<IT: InnerTypes> NativeSerialize<IT> for MemberSqlArg {
                     .downcast::<NativeSecurityContext<IT>>()
                     .unwrap()
                     .to_native(context_holder.clone()),
+                ContextSymbolArg::SqlUtils(context) => context
+                    .clone()
+                    .as_any()
+                    .downcast::<NativeSqlUtils<IT>>()
+                    .unwrap()
+                    .to_native(context_holder.clone()),
                 ContextSymbolArg::FilterParams(params) => params
                     .clone()
                     .as_any()
@@ -131,6 +175,9 @@ impl<IT: InnerTypes> MemberSql for NativeMemberSql<IT> {
     fn args_names(&self) -> &Vec<String> {
         &self.args_names
     }
+    fn need_deps_resolve(&self) -> bool {
+        !self.args_names.is_empty()
+    }
 }
 
 impl<IT: InnerTypes> NativeSerialize<IT> for NativeMemberSql<IT> {
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/mod.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/mod.rs
index c32f95c33c..6fa12c63c4 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/mod.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/mod.rs
@@ -5,14 +5,19 @@ pub mod dimension_definition;
 pub mod evaluator;
 pub mod filter_group;
 pub mod filter_params;
+pub mod geo_item;
 pub mod join_definition;
 pub mod join_graph;
+pub mod join_hints;
 pub mod join_item;
 pub mod join_item_definition;
 pub mod measure_definition;
 pub mod measure_filter;
 pub mod member_definition;
+pub mod member_expression;
 pub mod member_order_by;
-pub mod memeber_sql;
+pub mod member_sql;
+pub mod options_member;
 pub mod security_context;
 pub mod sql_templates_render;
+pub mod sql_utils;
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/options_member.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/options_member.rs
new file mode 100644
index 0000000000..11918839cd
--- /dev/null
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/options_member.rs
@@ -0,0 +1,25 @@
+use super::member_expression::{MemberExpressionDefinition, NativeMemberExpressionDefinition};
+use cubenativeutils::wrappers::inner_types::InnerTypes;
+use cubenativeutils::wrappers::serializer::NativeDeserialize;
+use cubenativeutils::wrappers::NativeObjectHandle;
+use cubenativeutils::CubeError;
+use std::rc::Rc;
+
+pub enum OptionsMember {
+    MemberName(String),
+    MemberExpression(Rc<dyn MemberExpressionDefinition>),
+}
+
+impl<IT: InnerTypes> NativeDeserialize<IT> for OptionsMember {
+    fn from_native(native_object: NativeObjectHandle<IT>) -> Result<Self, CubeError> {
+        match String::from_native(native_object.clone()) {
+            Ok(name) => Ok(Self::MemberName(name)),
+            Err(_) => match NativeMemberExpressionDefinition::from_native(native_object) {
+                Ok(expr) => Ok(Self::MemberExpression(Rc::new(expr))),
+                Err(_) => Err(CubeError::user(format!(
+                    "Member name or member expression map expected"
+                ))),
+            },
+        }
+    }
+}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/sql_utils.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/sql_utils.rs
new file mode 100644
index 0000000000..84d78dd137
--- /dev/null
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/sql_utils.rs
@@ -0,0 +1,9 @@
+use cubenativeutils::wrappers::serializer::{NativeDeserialize, NativeSerialize};
+use cubenativeutils::wrappers::NativeContextHolder;
+use cubenativeutils::wrappers::NativeObjectHandle;
+use cubenativeutils::CubeError;
+use std::any::Any;
+use std::rc::Rc;
+
+#[nativebridge::native_bridge]
+pub trait SqlUtils {}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/plan/builder/select.rs b/rust/cubesqlplanner/cubesqlplanner/src/plan/builder/select.rs
index 1a9482f687..0631a868ce 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/plan/builder/select.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/plan/builder/select.rs
@@ -40,6 +40,22 @@ impl SelectBuilder {
         }
     }
 
+    pub fn new_from_select(select: Rc<Select>) -> Self {
+        Self {
+            projection_columns: select.projection_columns.clone(),
+            from: select.from.clone(),
+            filter: select.filter.clone(),
+            group_by: select.group_by.clone(),
+            having: select.having.clone(),
+            order_by: select.order_by.clone(),
+            ctes: select.ctes.clone(),
+            is_distinct: select.is_distinct,
+            limit: select.limit,
+            offset: select.offset,
+            result_schema: Schema::clone(&select.schema),
+        }
+    }
+
     pub fn add_projection_member(&mut self, member: &Rc<dyn BaseMember>, alias: Option<String>) {
         let alias = if let Some(alias) = alias {
             alias
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/plan/expression.rs b/rust/cubesqlplanner/cubesqlplanner/src/plan/expression.rs
index 34ff7816ac..57fb6fae5d 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/plan/expression.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/plan/expression.rs
@@ -16,10 +16,10 @@ impl MemberExpression {
 
     pub fn to_sql(
         &self,
-        _templates: &PlanSqlTemplates,
+        templates: &PlanSqlTemplates,
         context: Rc<VisitorContext>,
     ) -> Result<String, CubeError> {
-        self.member.to_sql(context)
+        self.member.to_sql(context, templates)
     }
 }
 
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/plan/filter.rs b/rust/cubesqlplanner/cubesqlplanner/src/plan/filter.rs
index 123463e240..df354baceb 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/plan/filter.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/plan/filter.rs
@@ -36,6 +36,7 @@ pub enum FilterItem {
     Item(Rc<BaseFilter>),
 }
 
+#[derive(Clone)]
 pub struct Filter {
     pub items: Vec<FilterItem>,
 }
@@ -74,7 +75,7 @@ impl FilterItem {
                 }
             }
             FilterItem::Item(item) => {
-                let sql = item.to_sql(context.clone())?;
+                let sql = item.to_sql(context.clone(), templates)?;
                 format!("({})", sql)
             }
         };
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/plan/from.rs b/rust/cubesqlplanner/cubesqlplanner/src/plan/from.rs
index 175fb662ca..30a174488a 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/plan/from.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/plan/from.rs
@@ -19,7 +19,7 @@ impl SingleSource {
     ) -> Result<String, CubeError> {
         let sql = match &self {
             SingleSource::Cube(cube) => {
-                let cubesql = cube.to_sql(context.clone())?;
+                let cubesql = cube.to_sql(context.clone(), templates)?;
                 format!(" {} ", cubesql)
             }
             SingleSource::Subquery(s) => format!("({})", s.to_sql(templates)?),
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/plan/join.rs b/rust/cubesqlplanner/cubesqlplanner/src/plan/join.rs
index 1ac747410d..818cbfed95 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/plan/join.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/plan/join.rs
@@ -1,4 +1,5 @@
 use super::{Expr, SingleAliasedSource};
+use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_templates::PlanSqlTemplates;
 use crate::planner::{BaseJoinCondition, VisitorContext};
 use cubenativeutils::CubeError;
@@ -6,7 +7,7 @@ use lazy_static::lazy_static;
 
 use std::rc::Rc;
 
-pub struct RollingWindowJoinCondition {
+pub struct RegularRollingWindowJoinCondition {
     time_series_source: String,
     trailing_interval: Option<String>,
     leading_interval: Option<String>,
@@ -14,7 +15,7 @@ pub struct RollingWindowJoinCondition {
     time_dimension: Expr,
 }
 
-impl RollingWindowJoinCondition {
+impl RegularRollingWindowJoinCondition {
     pub fn new(
         time_series_source: String,
         trailing_interval: Option<String>,
@@ -87,6 +88,50 @@ impl RollingWindowJoinCondition {
     }
 }
 
+pub struct ToDateRollingWindowJoinCondition {
+    time_series_source: String,
+    granularity: String,
+    time_dimension: Expr,
+    query_tools: Rc<QueryTools>,
+}
+
+impl ToDateRollingWindowJoinCondition {
+    pub fn new(
+        time_series_source: String,
+        granularity: String,
+        time_dimension: Expr,
+        query_tools: Rc<QueryTools>,
+    ) -> Self {
+        Self {
+            time_series_source,
+            granularity,
+            time_dimension,
+            query_tools,
+        }
+    }
+
+    pub fn to_sql(
+        &self,
+        templates: &PlanSqlTemplates,
+        context: Rc<VisitorContext>,
+    ) -> Result<String, CubeError> {
+        let date_column = self.time_dimension.to_sql(templates, context)?;
+
+        //(dateFrom, dateTo, dateField, dimensionDateFrom, dimensionDateTo, isFromStartToEnd) => `${dateField} >= ${this.timeGroupedColumn(granularity, dateFrom)} AND ${dateField} <= ${dateTo}`
+
+        let date_from =
+            templates.column_reference(&Some(self.time_series_source.clone()), "date_to")?;
+        let date_to =
+            templates.column_reference(&Some(self.time_series_source.clone()), "date_from")?;
+        let grouped_from = self
+            .query_tools
+            .base_tools()
+            .time_grouped_column(self.granularity.clone(), date_from)?;
+        let result = format!("{date_column} >= {grouped_from} and {date_column} <= {date_to}");
+        Ok(result)
+    }
+}
+
 pub struct DimensionJoinCondition {
     // AND (... OR ...)
     conditions: Vec<Vec<(Expr, Expr)>>,
@@ -145,7 +190,8 @@ impl DimensionJoinCondition {
 pub enum JoinCondition {
     DimensionJoinCondition(DimensionJoinCondition),
     BaseJoinCondition(Rc<dyn BaseJoinCondition>),
-    RollingWindowJoinCondition(RollingWindowJoinCondition),
+    RegularRollingWindowJoinCondition(RegularRollingWindowJoinCondition),
+    ToDateRollingWindowJoinCondition(ToDateRollingWindowJoinCondition),
 }
 
 impl JoinCondition {
@@ -153,14 +199,14 @@ impl JoinCondition {
         Self::DimensionJoinCondition(DimensionJoinCondition::new(conditions, null_check))
     }
 
-    pub fn new_rolling_join(
+    pub fn new_regular_rolling_join(
         time_series_source: String,
         trailing_interval: Option<String>,
         leading_interval: Option<String>,
         offset: String,
         time_dimension: Expr,
     ) -> Self {
-        Self::RollingWindowJoinCondition(RollingWindowJoinCondition::new(
+        Self::RegularRollingWindowJoinCondition(RegularRollingWindowJoinCondition::new(
             time_series_source,
             trailing_interval,
             leading_interval,
@@ -169,6 +215,20 @@ impl JoinCondition {
         ))
     }
 
+    pub fn new_to_date_rolling_join(
+        time_series_source: String,
+        granularity: String,
+        time_dimension: Expr,
+        query_tools: Rc<QueryTools>,
+    ) -> Self {
+        Self::ToDateRollingWindowJoinCondition(ToDateRollingWindowJoinCondition::new(
+            time_series_source,
+            granularity,
+            time_dimension,
+            query_tools,
+        ))
+    }
+
     pub fn new_base_join(base: Rc<dyn BaseJoinCondition>) -> Self {
         Self::BaseJoinCondition(base)
     }
@@ -180,8 +240,13 @@ impl JoinCondition {
     ) -> Result<String, CubeError> {
         match &self {
             JoinCondition::DimensionJoinCondition(cond) => cond.to_sql(templates, context),
-            JoinCondition::BaseJoinCondition(cond) => cond.to_sql(context),
-            JoinCondition::RollingWindowJoinCondition(cond) => cond.to_sql(templates, context),
+            JoinCondition::BaseJoinCondition(cond) => cond.to_sql(context, templates),
+            JoinCondition::RegularRollingWindowJoinCondition(cond) => {
+                cond.to_sql(templates, context)
+            }
+            JoinCondition::ToDateRollingWindowJoinCondition(cond) => {
+                cond.to_sql(templates, context)
+            }
         }
     }
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/plan/mod.rs b/rust/cubesqlplanner/cubesqlplanner/src/plan/mod.rs
index 3799935638..2117bf42d5 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/plan/mod.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/plan/mod.rs
@@ -16,7 +16,7 @@ pub use cte::Cte;
 pub use expression::{Expr, MemberExpression};
 pub use filter::{Filter, FilterGroup, FilterItem};
 pub use from::{From, FromSource, SingleAliasedSource, SingleSource};
-pub use join::{Join, JoinCondition, JoinItem, RollingWindowJoinCondition};
+pub use join::{Join, JoinCondition, JoinItem, RegularRollingWindowJoinCondition};
 pub use order::OrderBy;
 pub use query_plan::QueryPlan;
 pub use schema::{QualifiedColumnName, Schema, SchemaColumn};
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/plan/order.rs b/rust/cubesqlplanner/cubesqlplanner/src/plan/order.rs
index c9db9a6b4b..1596a35982 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/plan/order.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/plan/order.rs
@@ -1,5 +1,6 @@
 use super::Expr;
 
+#[derive(Clone)]
 pub struct OrderBy {
     pub expr: Expr,
     pub pos: usize,
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/plan/schema/schema.rs b/rust/cubesqlplanner/cubesqlplanner/src/plan/schema/schema.rs
index 52ed83390c..cfbc4a43b7 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/plan/schema/schema.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/plan/schema/schema.rs
@@ -3,7 +3,7 @@ use crate::planner::BaseMember;
 use itertools::Itertools;
 use std::rc::Rc;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Schema {
     columns: Vec<SchemaColumn>,
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/plan/select.rs b/rust/cubesqlplanner/cubesqlplanner/src/plan/select.rs
index 2c37717014..ef0dd3cc47 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/plan/select.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/plan/select.rs
@@ -7,6 +7,7 @@ use crate::planner::VisitorContext;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 
+#[derive(Clone)]
 pub struct AliasedExpr {
     pub expr: Expr,
     pub alias: String,
@@ -32,6 +33,7 @@ impl AliasedExpr {
     }
 }
 
+#[derive(Clone)]
 pub struct Select {
     pub(super) projection_columns: Vec<AliasedExpr>,
     pub(super) from: Rc<From>,
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_cube.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_cube.rs
index 49107d4af1..4fb0d0989c 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_cube.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_cube.rs
@@ -2,6 +2,7 @@ use super::query_tools::QueryTools;
 use super::sql_evaluator::MemberSymbol;
 use super::{evaluate_with_context, VisitorContext};
 use crate::cube_bridge::cube_definition::CubeDefinition;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::collections::HashSet;
 use std::rc::Rc;
@@ -37,9 +38,17 @@ impl BaseCube {
         }))
     }
 
-    pub fn to_sql(&self, context: Rc<VisitorContext>) -> Result<String, CubeError> {
-        let cube_sql =
-            evaluate_with_context(&self.member_evaluator, self.query_tools.clone(), context)?;
+    pub fn to_sql(
+        &self,
+        context: Rc<VisitorContext>,
+        templates: &PlanSqlTemplates,
+    ) -> Result<String, CubeError> {
+        let cube_sql = evaluate_with_context(
+            &self.member_evaluator,
+            self.query_tools.clone(),
+            context,
+            templates,
+        )?;
         Ok(cube_sql)
     }
 
@@ -69,10 +78,11 @@ impl BaseCube {
 
     pub fn default_alias_with_prefix(&self, prefix: &Option<String>) -> String {
         let alias = self.default_alias();
-        if let Some(prefix) = prefix {
+        let res = if let Some(prefix) = prefix {
             format!("{prefix}_{alias}")
         } else {
             alias
-        }
+        };
+        self.query_tools.alias_name(&res)
     }
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_dimension.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_dimension.rs
index bca6d99ca2..87bb6740aa 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_dimension.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_dimension.rs
@@ -1,6 +1,8 @@
 use super::query_tools::QueryTools;
-use super::sql_evaluator::MemberSymbol;
+use super::sql_evaluator::{MemberExpressionSymbol, MemberSymbol, SqlCall};
 use super::{evaluate_with_context, BaseMember, BaseMemberHelper, VisitorContext};
+use crate::cube_bridge::dimension_definition::DimensionDefinition;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 
@@ -8,14 +10,30 @@ pub struct BaseDimension {
     dimension: String,
     query_tools: Rc<QueryTools>,
     member_evaluator: Rc<MemberSymbol>,
+    definition: Option<Rc<dyn DimensionDefinition>>,
+    #[allow(dead_code)]
+    member_expression_definition: Option<String>,
     cube_name: String,
     name: String,
     default_alias: String,
 }
 
 impl BaseMember for BaseDimension {
-    fn to_sql(&self, context: Rc<VisitorContext>) -> Result<String, CubeError> {
-        evaluate_with_context(&self.member_evaluator, self.query_tools.clone(), context)
+    fn to_sql(
+        &self,
+        context: Rc<VisitorContext>,
+        templates: &PlanSqlTemplates,
+    ) -> Result<String, CubeError> {
+        evaluate_with_context(
+            &self.member_evaluator,
+            self.query_tools.clone(),
+            context,
+            templates,
+        )
+    }
+
+    fn full_name(&self) -> String {
+        self.member_evaluator.full_name()
     }
 
     fn alias_name(&self) -> String {
@@ -58,6 +76,8 @@ impl BaseDimension {
                     member_evaluator: evaluation_node.clone(),
                     cube_name: s.cube_name().clone(),
                     name: s.name().clone(),
+                    definition: Some(s.definition().clone()),
+                    member_expression_definition: None,
                     default_alias,
                 }))
             }
@@ -79,11 +99,72 @@ impl BaseDimension {
         }
     }
 
+    pub fn try_new_from_expression(
+        expression: Rc<SqlCall>,
+        cube_name: String,
+        name: String,
+        member_expression_definition: Option<String>,
+        query_tools: Rc<QueryTools>,
+    ) -> Result<Rc<Self>, CubeError> {
+        let member_expression_symbol = MemberExpressionSymbol::new(
+            cube_name.clone(),
+            name.clone(),
+            expression,
+            member_expression_definition.clone(),
+        );
+        let full_name = member_expression_symbol.full_name();
+        let member_evaluator = Rc::new(MemberSymbol::MemberExpression(member_expression_symbol));
+        let default_alias = PlanSqlTemplates::alias_name(&name);
+
+        Ok(Rc::new(Self {
+            dimension: full_name,
+            query_tools,
+            member_evaluator,
+            definition: None,
+            cube_name,
+            name,
+            member_expression_definition,
+            default_alias,
+        }))
+    }
+
     pub fn member_evaluator(&self) -> Rc<MemberSymbol> {
         self.member_evaluator.clone()
     }
 
+    pub fn sql_call(&self) -> Result<Rc<SqlCall>, CubeError> {
+        match self.member_evaluator.as_ref() {
+            MemberSymbol::Dimension(d) => {
+                if let Some(sql) = d.member_sql() {
+                    Ok(sql.clone())
+                } else {
+                    Err(CubeError::user(format!(
+                        "Dimension {} hasn't sql evaluator",
+                        self.full_name()
+                    )))
+                }
+            }
+            _ => Err(CubeError::internal(format!(
+                "MemberSymbol::Dimension expected"
+            ))),
+        }
+    }
+
     pub fn dimension(&self) -> &String {
         &self.dimension
     }
+
+    pub fn is_sub_query(&self) -> bool {
+        self.definition
+            .as_ref()
+            .map_or(false, |def| def.static_data().sub_query.unwrap_or(false))
+    }
+
+    pub fn propagate_filters_to_sub_query(&self) -> bool {
+        self.definition.as_ref().map_or(false, |def| {
+            def.static_data()
+                .propagate_filters_to_sub_query
+                .unwrap_or(false)
+        })
+    }
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_join_condition.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_join_condition.rs
index c90c901fbc..29eb21cf1c 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_join_condition.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_join_condition.rs
@@ -1,10 +1,15 @@
 use super::query_tools::QueryTools;
 use super::sql_evaluator::SqlCall;
 use super::{evaluate_sql_call_with_context, VisitorContext};
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 pub trait BaseJoinCondition {
-    fn to_sql(&self, context: Rc<VisitorContext>) -> Result<String, CubeError>;
+    fn to_sql(
+        &self,
+        context: Rc<VisitorContext>,
+        templates: &PlanSqlTemplates,
+    ) -> Result<String, CubeError>;
 }
 pub struct SqlJoinCondition {
     sql_call: Rc<SqlCall>,
@@ -23,7 +28,11 @@ impl SqlJoinCondition {
 }
 
 impl BaseJoinCondition for SqlJoinCondition {
-    fn to_sql(&self, context: Rc<VisitorContext>) -> Result<String, CubeError> {
-        evaluate_sql_call_with_context(&self.sql_call, self.query_tools.clone(), context)
+    fn to_sql(
+        &self,
+        context: Rc<VisitorContext>,
+        templates: &PlanSqlTemplates,
+    ) -> Result<String, CubeError> {
+        evaluate_sql_call_with_context(&self.sql_call, self.query_tools.clone(), context, templates)
     }
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_measure.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_measure.rs
index e61724563d..4a1941e806 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_measure.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_measure.rs
@@ -1,9 +1,10 @@
 use super::query_tools::QueryTools;
-use super::sql_evaluator::MemberSymbol;
+use super::sql_evaluator::{MemberExpressionSymbol, MemberSymbol, SqlCall};
 use super::{evaluate_with_context, BaseMember, BaseMemberHelper, VisitorContext};
 use crate::cube_bridge::measure_definition::{
     MeasureDefinition, RollingWindow, TimeShiftReference,
 };
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use lazy_static::lazy_static;
 use regex::Regex;
@@ -66,7 +67,9 @@ pub struct BaseMeasure {
     measure: String,
     query_tools: Rc<QueryTools>,
     member_evaluator: Rc<MemberSymbol>,
-    definition: Rc<dyn MeasureDefinition>,
+    definition: Option<Rc<dyn MeasureDefinition>>,
+    #[allow(dead_code)]
+    member_expression_definition: Option<String>,
     time_shifts: Vec<MeasureTimeShift>,
     cube_name: String,
     name: String,
@@ -84,8 +87,17 @@ impl Debug for BaseMeasure {
 }
 
 impl BaseMember for BaseMeasure {
-    fn to_sql(&self, context: Rc<VisitorContext>) -> Result<String, CubeError> {
-        evaluate_with_context(&self.member_evaluator, self.query_tools.clone(), context)
+    fn to_sql(
+        &self,
+        context: Rc<VisitorContext>,
+        templates: &PlanSqlTemplates,
+    ) -> Result<String, CubeError> {
+        evaluate_with_context(
+            &self.member_evaluator,
+            self.query_tools.clone(),
+            context,
+            templates,
+        )
     }
 
     fn alias_name(&self) -> String {
@@ -100,6 +112,10 @@ impl BaseMember for BaseMeasure {
         self.clone()
     }
 
+    fn full_name(&self) -> String {
+        format!("{}.{}", self.cube_name, self.name)
+    }
+
     fn cube_name(&self) -> &String {
         &self.cube_name
     }
@@ -127,7 +143,8 @@ impl BaseMeasure {
                     measure: s.full_name(),
                     query_tools: query_tools.clone(),
                     member_evaluator: evaluation_node.clone(),
-                    definition: s.definition().clone(),
+                    definition: Some(s.definition().clone()),
+                    member_expression_definition: None,
                     cube_name: s.cube_name().clone(),
                     name: s.name().clone(),
                     time_shifts,
@@ -152,6 +169,51 @@ impl BaseMeasure {
         }
     }
 
+    pub fn try_new_from_expression(
+        expression: Rc<SqlCall>,
+        cube_name: String,
+        name: String,
+        member_expression_definition: Option<String>,
+        query_tools: Rc<QueryTools>,
+    ) -> Result<Rc<Self>, CubeError> {
+        let member_expression_symbol = MemberExpressionSymbol::new(
+            cube_name.clone(),
+            name.clone(),
+            expression,
+            member_expression_definition.clone(),
+        );
+        let full_name = member_expression_symbol.full_name();
+        let member_evaluator = Rc::new(MemberSymbol::MemberExpression(member_expression_symbol));
+        let default_alias = PlanSqlTemplates::alias_name(&name);
+        Ok(Rc::new(Self {
+            measure: full_name,
+            query_tools,
+            member_evaluator,
+            definition: None,
+            cube_name,
+            name,
+            member_expression_definition,
+            default_alias,
+            time_shifts: vec![],
+        }))
+    }
+
+    pub fn can_used_as_addictive_in_multplied(&self) -> Result<bool, CubeError> {
+        let measure_type = self.measure_type();
+        let res = if measure_type == "countDistinct" || measure_type == "countDistinctApprox" {
+            true
+        } else if measure_type == "count" {
+            if let Some(definition) = &self.definition {
+                !definition.has_sql()?
+            } else {
+                false
+            }
+        } else {
+            false
+        };
+        Ok(res)
+    }
+
     fn parse_time_shifts(
         definition: &Rc<dyn MeasureDefinition>,
     ) -> Result<Vec<MeasureTimeShift>, CubeError> {
@@ -177,28 +239,36 @@ impl BaseMeasure {
         &self.cube_name
     }
 
-    pub fn reduce_by(&self) -> &Option<Vec<String>> {
-        &self.definition.static_data().reduce_by_references
+    pub fn reduce_by(&self) -> Option<Vec<String>> {
+        self.definition
+            .as_ref()
+            .map_or(None, |d| d.static_data().reduce_by_references.clone())
     }
 
-    pub fn add_group_by(&self) -> &Option<Vec<String>> {
-        &self.definition.static_data().add_group_by_references
+    pub fn add_group_by(&self) -> Option<Vec<String>> {
+        self.definition
+            .as_ref()
+            .map_or(None, |d| d.static_data().add_group_by_references.clone())
     }
 
-    pub fn group_by(&self) -> &Option<Vec<String>> {
-        &self.definition.static_data().group_by_references
+    pub fn group_by(&self) -> Option<Vec<String>> {
+        self.definition
+            .as_ref()
+            .map_or(None, |d| d.static_data().group_by_references.clone())
     }
 
     //FIXME dublicate with symbol
     pub fn is_calculated(&self) -> bool {
-        match self.definition.static_data().measure_type.as_str() {
+        match self.measure_type() {
             "number" | "string" | "time" | "boolean" => true,
             _ => false,
         }
     }
 
-    pub fn time_shift_references(&self) -> &Option<Vec<TimeShiftReference>> {
-        &self.definition.static_data().time_shift_references
+    pub fn time_shift_references(&self) -> Option<Vec<TimeShiftReference>> {
+        self.definition
+            .as_ref()
+            .map_or(None, |d| d.static_data().time_shift_references.clone())
     }
 
     pub fn time_shifts(&self) -> &Vec<MeasureTimeShift> {
@@ -206,11 +276,15 @@ impl BaseMeasure {
     }
 
     pub fn is_multi_stage(&self) -> bool {
-        self.definition.static_data().multi_stage.unwrap_or(false)
+        self.definition
+            .as_ref()
+            .map_or(false, |d| d.static_data().multi_stage.unwrap_or(false))
     }
 
-    pub fn rolling_window(&self) -> &Option<RollingWindow> {
-        &self.definition.static_data().rolling_window
+    pub fn rolling_window(&self) -> Option<RollingWindow> {
+        self.definition
+            .as_ref()
+            .map_or(None, |d| d.static_data().rolling_window.clone())
     }
 
     pub fn is_rolling_window(&self) -> bool {
@@ -226,11 +300,13 @@ impl BaseMeasure {
     }
 
     //FIXME dublicate with symbol
-    pub fn measure_type(&self) -> &String {
-        &self.definition.static_data().measure_type
+    pub fn measure_type(&self) -> &str {
+        self.definition
+            .as_ref()
+            .map_or("number", |d| &d.static_data().measure_type)
     }
 
     pub fn is_multi_stage_ungroupped(&self) -> bool {
-        self.is_calculated() || self.definition.static_data().measure_type == "rank"
+        self.is_calculated() || self.measure_type() == "rank"
     }
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_member.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_member.rs
index 0618a9101b..831e108181 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_member.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_member.rs
@@ -7,12 +7,14 @@ use itertools::Itertools;
 use std::rc::Rc;
 
 pub trait BaseMember {
-    fn to_sql(&self, context: Rc<VisitorContext>) -> Result<String, CubeError>;
+    fn to_sql(
+        &self,
+        context: Rc<VisitorContext>,
+        templates: &PlanSqlTemplates,
+    ) -> Result<String, CubeError>;
     fn alias_name(&self) -> String;
     fn member_evaluator(&self) -> Rc<MemberSymbol>;
-    fn full_name(&self) -> String {
-        self.member_evaluator().full_name()
-    }
+    fn full_name(&self) -> String;
     fn as_base_member(self: Rc<Self>) -> Rc<dyn BaseMember>;
     fn cube_name(&self) -> &String;
     fn name(&self) -> &String;
@@ -40,20 +42,19 @@ impl BaseMemberHelper {
         members.iter().map(|m| m.alias_name()).collect_vec()
     }
 
+    pub fn extract_symbols_from_members(
+        members: &Vec<Rc<dyn BaseMember>>,
+    ) -> Vec<Rc<MemberSymbol>> {
+        members.iter().map(|m| m.member_evaluator()).collect_vec()
+    }
+
     pub fn default_alias(
         cube_name: &String,
         member_name: &String,
         member_suffix: &Option<String>,
         query_tools: Rc<QueryTools>,
     ) -> Result<String, CubeError> {
-        let cube_definition = query_tools
-            .cube_evaluator()
-            .cube_from_path(cube_name.clone())?;
-        let cube_alias = if let Some(sql_alias) = &cube_definition.static_data().sql_alias {
-            sql_alias
-        } else {
-            cube_name
-        };
+        let cube_alias = query_tools.alias_for_cube(cube_name)?;
         Ok(PlanSqlTemplates::memeber_alias_name(
             &cube_alias,
             &member_name,
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_query.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_query.rs
index 6e59585e4f..21de374816 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_query.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_query.rs
@@ -1,19 +1,14 @@
-use super::planners::{
-    FullKeyAggregateQueryPlanner, MultiStageQueryPlanner, MultipliedMeasuresQueryPlanner,
-    SimpleQueryPlanner,
-};
+use super::planners::QueryPlanner;
 use super::query_tools::QueryTools;
 use super::QueryProperties;
 use crate::cube_bridge::base_query_options::BaseQueryOptions;
-use crate::plan::Select;
-use crate::planner::sql_evaluator::sql_nodes::SqlNodesFactory;
 use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::wrappers::inner_types::InnerTypes;
 use cubenativeutils::wrappers::object::NativeArray;
 use cubenativeutils::wrappers::serializer::NativeSerialize;
 use cubenativeutils::wrappers::NativeType;
-use cubenativeutils::wrappers::{NativeContextHolder, NativeObjectHandle};
-use cubenativeutils::CubeError;
+use cubenativeutils::wrappers::{NativeContextHolder, NativeObjectHandle, NativeStruct};
+use cubenativeutils::{CubeError, CubeErrorCauseType};
 use std::rc::Rc;
 
 pub struct BaseQuery<IT: InnerTypes> {
@@ -43,55 +38,53 @@ impl<IT: InnerTypes> BaseQuery<IT> {
         })
     }
 
-    pub fn build_sql_and_params(&self) -> Result<NativeObjectHandle<IT>, CubeError> {
+    pub fn build_sql_and_params(&self) -> NativeObjectHandle<IT> {
+        let build_result = self.build_sql_and_params_impl();
+        let result = self.context.empty_struct().unwrap();
+        match build_result {
+            Ok(res) => {
+                result.set_field("result", res).unwrap();
+            }
+            Err(e) => {
+                let error_descr = self.context.empty_struct().unwrap();
+                let error_cause = match &e.cause {
+                    CubeErrorCauseType::User(_) => "User",
+                    CubeErrorCauseType::Internal(_) => "Internal",
+                };
+                error_descr
+                    .set_field(
+                        "message",
+                        e.message.to_native(self.context.clone()).unwrap(),
+                    )
+                    .unwrap();
+                error_descr
+                    .set_field(
+                        "cause",
+                        error_cause.to_native(self.context.clone()).unwrap(),
+                    )
+                    .unwrap();
+                result
+                    .set_field("error", NativeObjectHandle::new(error_descr.into_object()))
+                    .unwrap();
+            }
+        }
+
+        NativeObjectHandle::new(result.into_object())
+    }
+
+    fn build_sql_and_params_impl(&self) -> Result<NativeObjectHandle<IT>, CubeError> {
         let templates = PlanSqlTemplates::new(self.query_tools.templates_render());
-        let plan = self.build_sql_and_params_impl(templates.clone())?;
+        let query_planner = QueryPlanner::new(self.request.clone(), self.query_tools.clone());
+        let plan = query_planner.plan()?;
 
         let sql = plan.to_sql(&templates)?;
         let (result_sql, params) = self.query_tools.build_sql_and_params(&sql, true)?;
 
-        let res = self.context.empty_array();
+        let res = self.context.empty_array()?;
         res.set(0, result_sql.to_native(self.context.clone())?)?;
         res.set(1, params.to_native(self.context.clone())?)?;
         let result = NativeObjectHandle::new(res.into_object());
 
         Ok(result)
     }
-
-    fn build_sql_and_params_impl(&self, templates: PlanSqlTemplates) -> Result<Select, CubeError> {
-        let mut nodes_factory = SqlNodesFactory::new();
-
-        if self.request.ungrouped() {
-            nodes_factory.set_ungrouped(true)
-        }
-
-        if self.request.is_simple_query()? {
-            let planner = SimpleQueryPlanner::new(
-                self.query_tools.clone(),
-                self.request.clone(),
-                nodes_factory.clone(),
-            );
-            planner.plan()
-        } else {
-            let request = self.request.clone();
-            let multiplied_measures_query_planner = MultipliedMeasuresQueryPlanner::new(
-                self.query_tools.clone(),
-                request.clone(),
-                nodes_factory.clone(),
-            );
-            let multi_stage_query_planner =
-                MultiStageQueryPlanner::new(self.query_tools.clone(), request.clone());
-            let full_key_aggregate_planner = FullKeyAggregateQueryPlanner::new(
-                request.clone(),
-                nodes_factory.clone(),
-                templates,
-            );
-            let mut subqueries = multiplied_measures_query_planner.plan_queries()?;
-            let (multi_stage_ctes, multi_stage_subqueries) =
-                multi_stage_query_planner.plan_queries()?;
-            subqueries.extend(multi_stage_subqueries.into_iter());
-            let result = full_key_aggregate_planner.plan(subqueries, multi_stage_ctes)?;
-            Ok(result)
-        }
-    }
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_time_dimension.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_time_dimension.rs
index cd0ad89812..61e5e606c7 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_time_dimension.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_time_dimension.rs
@@ -1,12 +1,14 @@
 use super::query_tools::QueryTools;
-use super::sql_evaluator::MemberSymbol;
+use super::sql_evaluator::{MemberSymbol, TimeDimensionSymbol};
 use super::BaseDimension;
-use super::{BaseMember, BaseMemberHelper, VisitorContext};
+use super::{evaluate_with_context, BaseMember, BaseMemberHelper, VisitorContext};
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 
 pub struct BaseTimeDimension {
     dimension: Rc<BaseDimension>,
+    member_evaluator: Rc<MemberSymbol>,
     query_tools: Rc<QueryTools>,
     granularity: Option<String>,
     date_range: Option<Vec<String>>,
@@ -15,8 +17,17 @@ pub struct BaseTimeDimension {
 }
 
 impl BaseMember for BaseTimeDimension {
-    fn to_sql(&self, context: Rc<VisitorContext>) -> Result<String, CubeError> {
-        self.dimension.to_sql(context)
+    fn to_sql(
+        &self,
+        context: Rc<VisitorContext>,
+        templates: &PlanSqlTemplates,
+    ) -> Result<String, CubeError> {
+        evaluate_with_context(
+            &self.member_evaluator,
+            self.query_tools.clone(),
+            context,
+            templates,
+        )
     }
 
     fn alias_name(&self) -> String {
@@ -24,7 +35,11 @@ impl BaseMember for BaseTimeDimension {
     }
 
     fn member_evaluator(&self) -> Rc<MemberSymbol> {
-        self.dimension.member_evaluator()
+        self.member_evaluator.clone()
+    }
+
+    fn full_name(&self) -> String {
+        self.member_evaluator.full_name()
     }
 
     fn as_base_member(self: Rc<Self>) -> Rc<dyn BaseMember> {
@@ -56,13 +71,18 @@ impl BaseTimeDimension {
         } else {
             "day".to_string()
         };
-        let dimension = BaseDimension::try_new_required(member_evaluator, query_tools.clone())?;
+        let dimension =
+            BaseDimension::try_new_required(member_evaluator.clone(), query_tools.clone())?;
         let default_alias = BaseMemberHelper::default_alias(
             &dimension.cube_name(),
             &dimension.name(),
             &Some(alias_suffix.clone()),
             query_tools.clone(),
         )?;
+        let member_evaluator = Rc::new(MemberSymbol::TimeDimension(TimeDimensionSymbol::new(
+            member_evaluator.clone(),
+            granularity.clone(),
+        )));
         Ok(Rc::new(Self {
             dimension,
             query_tools,
@@ -70,10 +90,15 @@ impl BaseTimeDimension {
             date_range,
             alias_suffix,
             default_alias,
+            member_evaluator,
         }))
     }
 
     pub fn change_granularity(&self, new_granularity: Option<String>) -> Rc<Self> {
+        let member_evaluator = Rc::new(MemberSymbol::TimeDimension(TimeDimensionSymbol::new(
+            self.dimension.member_evaluator(),
+            new_granularity.clone(),
+        )));
         Rc::new(Self {
             dimension: self.dimension.clone(),
             query_tools: self.query_tools.clone(),
@@ -81,6 +106,7 @@ impl BaseTimeDimension {
             date_range: self.date_range.clone(),
             alias_suffix: self.alias_suffix.clone(),
             default_alias: self.default_alias.clone(),
+            member_evaluator,
         })
     }
 
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/base_filter.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/base_filter.rs
index b9e5a88297..4b77c9eef4 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/base_filter.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/base_filter.rs
@@ -2,6 +2,7 @@ use super::filter_operator::FilterOperator;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::MemberSymbol;
 use crate::planner::sql_templates::filter::FilterTemplates;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use crate::planner::{evaluate_with_context, VisitorContext};
 use cubenativeutils::CubeError;
 use lazy_static::lazy_static;
@@ -95,28 +96,89 @@ impl BaseFilter {
         self.member_evaluator.full_name()
     }
 
-    pub fn to_sql(&self, context: Rc<VisitorContext>) -> Result<String, CubeError> {
-        let member_sql =
-            evaluate_with_context(&self.member_evaluator, self.query_tools.clone(), context)?;
-        let res = match self.filter_operator {
-            FilterOperator::Equal => self.equals_where(&member_sql)?,
-            FilterOperator::NotEqual => self.not_equals_where(&member_sql)?,
-            FilterOperator::InDateRange => self.in_date_range(&member_sql)?,
-            FilterOperator::InDateRangeExtended => self.in_date_range_extended(&member_sql)?,
-            FilterOperator::In => self.in_where(&member_sql)?,
-            FilterOperator::NotIn => self.not_in_where(&member_sql)?,
-            FilterOperator::Set => self.set_where(&member_sql)?,
-            FilterOperator::NotSet => self.not_set_where(&member_sql)?,
-            FilterOperator::Gt => self.gt_where(&member_sql)?,
-            FilterOperator::Gte => self.gte_where(&member_sql)?,
-            FilterOperator::Lt => self.lt_where(&member_sql)?,
-            FilterOperator::Lte => self.lte_where(&member_sql)?,
-            FilterOperator::Contains => self.contains_where(&member_sql)?,
-            FilterOperator::NotContains => self.not_contains_where(&member_sql)?,
-            FilterOperator::StartsWith => self.starts_with_where(&member_sql)?,
-            FilterOperator::NotStartsWith => self.not_starts_with_where(&member_sql)?,
-            FilterOperator::EndsWith => self.ends_with_where(&member_sql)?,
-            FilterOperator::NotEndsWith => self.not_ends_with_where(&member_sql)?,
+    pub fn to_sql(
+        &self,
+        context: Rc<VisitorContext>,
+        plan_templates: &PlanSqlTemplates,
+    ) -> Result<String, CubeError> {
+        if matches!(self.filter_operator, FilterOperator::MeasureFilter) {
+            self.measure_filter_where(context, plan_templates)
+        } else {
+            let member_sql = evaluate_with_context(
+                &self.member_evaluator,
+                self.query_tools.clone(),
+                context,
+                plan_templates,
+            )?;
+            let res = match self.filter_operator {
+                FilterOperator::Equal => self.equals_where(&member_sql)?,
+                FilterOperator::NotEqual => self.not_equals_where(&member_sql)?,
+                FilterOperator::InDateRange => self.in_date_range(&member_sql)?,
+                FilterOperator::RegularRollingWindowDateRange => {
+                    self.regular_rolling_window_date_range(&member_sql)?
+                }
+                FilterOperator::ToDateRollingWindowDateRange => {
+                    self.to_date_rolling_window_date_range(&member_sql)?
+                }
+                FilterOperator::In => self.in_where(&member_sql)?,
+                FilterOperator::NotIn => self.not_in_where(&member_sql)?,
+                FilterOperator::Set => self.set_where(&member_sql)?,
+                FilterOperator::NotSet => self.not_set_where(&member_sql)?,
+                FilterOperator::Gt => self.gt_where(&member_sql)?,
+                FilterOperator::Gte => self.gte_where(&member_sql)?,
+                FilterOperator::Lt => self.lt_where(&member_sql)?,
+                FilterOperator::Lte => self.lte_where(&member_sql)?,
+                FilterOperator::Contains => self.contains_where(&member_sql)?,
+                FilterOperator::NotContains => self.not_contains_where(&member_sql)?,
+                FilterOperator::StartsWith => self.starts_with_where(&member_sql)?,
+                FilterOperator::NotStartsWith => self.not_starts_with_where(&member_sql)?,
+                FilterOperator::EndsWith => self.ends_with_where(&member_sql)?,
+                FilterOperator::NotEndsWith => self.not_ends_with_where(&member_sql)?,
+                FilterOperator::MeasureFilter => {
+                    return Err(CubeError::internal(format!(
+                        "Measure filter should be processed separately"
+                    )));
+                }
+            };
+            Ok(res)
+        }
+    }
+
+    fn measure_filter_where(
+        &self,
+        context: Rc<VisitorContext>,
+        plan_templates: &PlanSqlTemplates,
+    ) -> Result<String, CubeError> {
+        let res = match self.member_evaluator.as_ref() {
+            MemberSymbol::Measure(measure_symbol) => {
+                if measure_symbol.measure_filters().is_empty()
+                    && measure_symbol.measure_drill_filters().is_empty()
+                {
+                    self.templates.always_true()?
+                } else {
+                    let visitor = context.make_visitor(self.query_tools.clone());
+                    let node_processor = context.node_processor();
+
+                    measure_symbol
+                        .measure_filters()
+                        .iter()
+                        .chain(measure_symbol.measure_drill_filters().iter())
+                        .map(|filter| -> Result<String, CubeError> {
+                            Ok(format!(
+                                "({})",
+                                filter.eval(
+                                    &visitor,
+                                    node_processor.clone(),
+                                    self.query_tools.clone(),
+                                    plan_templates
+                                )?
+                            ))
+                        })
+                        .collect::<Result<Vec<_>, _>>()?
+                        .join(" AND ")
+                }
+            }
+            _ => self.templates.always_true()?,
         };
         Ok(res)
     }
@@ -154,7 +216,7 @@ impl BaseFilter {
     }
 
     fn in_date_range(&self, member_sql: &str) -> Result<String, CubeError> {
-        let (from, to) = self.allocate_date_params()?;
+        let (from, to) = self.allocate_date_params(true)?;
         self.templates
             .time_range_filter(member_sql.to_string(), from, to)
     }
@@ -179,8 +241,9 @@ impl BaseFilter {
             Ok(date.to_string())
         }
     }
-    fn in_date_range_extended(&self, member_sql: &str) -> Result<String, CubeError> {
-        let (from, to) = self.allocate_date_params()?;
+
+    fn regular_rolling_window_date_range(&self, member_sql: &str) -> Result<String, CubeError> {
+        let (from, to) = self.allocate_date_params(false)?;
 
         let from = if self.values.len() >= 3 {
             self.extend_date_range_bound(from, &self.values[2], true)?
@@ -194,8 +257,37 @@ impl BaseFilter {
             to
         };
 
-        self.templates
-            .time_range_filter(member_sql.to_string(), from, to)
+        let date_field = self
+            .query_tools
+            .base_tools()
+            .convert_tz(member_sql.to_string())?;
+        self.templates.time_range_filter(date_field, from, to)
+    }
+
+    fn to_date_rolling_window_date_range(&self, member_sql: &str) -> Result<String, CubeError> {
+        let (from, to) = self.allocate_date_params(false)?;
+
+        let from = if self.values.len() >= 3 {
+            if let Some(granularity) = &self.values[2] {
+                self.query_tools
+                    .base_tools()
+                    .time_grouped_column(granularity.clone(), from)?
+            } else {
+                return Err(CubeError::user(format!(
+                    "Granularity required for to_date rolling window"
+                )));
+            }
+        } else {
+            return Err(CubeError::user(format!(
+                "Granularity required for to_date rolling window"
+            )));
+        };
+
+        let date_field = self
+            .query_tools
+            .base_tools()
+            .convert_tz(member_sql.to_string())?;
+        self.templates.time_range_filter(date_field, from, to)
     }
 
     fn in_where(&self, member_sql: &str) -> Result<String, CubeError> {
@@ -296,12 +388,16 @@ impl BaseFilter {
         ))
     }
 
-    fn allocate_date_params(&self) -> Result<(String, String), CubeError> {
+    fn allocate_date_params(&self, use_db_time_zone: bool) -> Result<(String, String), CubeError> {
         if self.values.len() >= 2 {
             let from = if let Some(from_str) = &self.values[0] {
-                self.query_tools
-                    .base_tools()
-                    .in_db_time_zone(self.format_from_date(&from_str)?)?
+                let from = self.format_from_date(&from_str)?;
+
+                if use_db_time_zone {
+                    self.query_tools.base_tools().in_db_time_zone(from)?
+                } else {
+                    from
+                }
             } else {
                 return Err(CubeError::user(format!(
                     "Arguments for date range is not valid"
@@ -309,9 +405,13 @@ impl BaseFilter {
             };
 
             let to = if let Some(to_str) = &self.values[1] {
-                self.query_tools
-                    .base_tools()
-                    .in_db_time_zone(self.format_to_date(&to_str)?)?
+                let to = self.format_to_date(&to_str)?;
+
+                if use_db_time_zone {
+                    self.query_tools.base_tools().in_db_time_zone(to)?
+                } else {
+                    to
+                }
             } else {
                 return Err(CubeError::user(format!(
                     "Arguments for date range is not valid"
@@ -354,11 +454,7 @@ impl BaseFilter {
                 "0".repeat(precision as usize)
             ));
         }
-        //FIXME chrono don't support parsing date without specified format
-        Err(CubeError::user(format!(
-            "Unsupported date format: {}",
-            date
-        )))
+        Ok(date.to_string())
     }
 
     fn format_to_date(&self, date: &str) -> Result<String, CubeError> {
@@ -390,11 +486,8 @@ impl BaseFilter {
                 "9".repeat(precision as usize)
             ));
         }
-        //FIXME chrono don't support parsing date without specified format
-        Err(CubeError::user(format!(
-            "Unsupported date format: {}",
-            date
-        )))
+
+        Ok(date.to_string())
     }
 
     fn allocate_param(&self, param: &str) -> String {
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/compiler.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/compiler.rs
index 17e8a64a6b..e918fbb8d1 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/compiler.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/compiler.rs
@@ -82,13 +82,13 @@ impl<'a> FilterCompiler<'a> {
             Ok(FilterItem::Group(Rc::new(FilterGroup::new(op, items))))
         } else {
             if let (Some(member), Some(operator)) = (item.member(), &item.operator) {
-                let evaluator = match item_type {
-                    FilterType::Dimension => self
-                        .evaluator_compiler
-                        .add_dimension_evaluator(member.clone())?,
-                    FilterType::Measure => self
-                        .evaluator_compiler
-                        .add_measure_evaluator(member.clone())?,
+                let member_path = member.split(".").map(|m| m.to_string()).collect::<Vec<_>>();
+                let evaluator = if self.query_tools.cube_evaluator().is_measure(member_path)? {
+                    self.evaluator_compiler
+                        .add_measure_evaluator(member.clone())?
+                } else {
+                    self.evaluator_compiler
+                        .add_dimension_evaluator(member.clone())?
                 };
                 Ok(FilterItem::Item(BaseFilter::try_new(
                     self.query_tools.clone(),
@@ -115,16 +115,20 @@ impl<'a> FilterCompiler<'a> {
         } else if let Some(items) = &item.and {
             self.get_item_type_from_vec(&items, expected_type)
         } else {
-            if let Some(member) = item.member() {
+            if let (Some(member), Some(operator)) = (item.member(), &item.operator) {
+                let operator = FilterOperator::from_str(&operator)?;
+                let is_measure_filter_op = matches!(operator, FilterOperator::MeasureFilter);
                 let member_path = member.split(".").map(|m| m.to_string()).collect::<Vec<_>>();
-                if self.query_tools.cube_evaluator().is_measure(member_path)? {
+                if self.query_tools.cube_evaluator().is_measure(member_path)?
+                    && !is_measure_filter_op
+                {
                     Ok(Some(FilterType::Measure))
                 } else {
                     Ok(Some(FilterType::Dimension))
                 }
             } else {
                 Err(CubeError::user(format!(
-                    "Member attribute is required for filter"
+                    "Member and operator attributes is required for filter"
                 ))) //TODO pring condition
             }
         }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/filter_operator.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/filter_operator.rs
index 30e0e39012..99d946e462 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/filter_operator.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/filter_operator.rs
@@ -6,7 +6,8 @@ pub enum FilterOperator {
     Equal,
     NotEqual,
     InDateRange,
-    InDateRangeExtended,
+    RegularRollingWindowDateRange,
+    ToDateRollingWindowDateRange,
     In,
     NotIn,
     Set,
@@ -21,19 +22,21 @@ pub enum FilterOperator {
     NotStartsWith,
     NotEndsWith,
     EndsWith,
+    MeasureFilter,
 }
 
 impl FromStr for FilterOperator {
     type Err = CubeError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s.to_lowercase().as_str() {
+        match s.to_lowercase().replace("_", "").as_str() {
             "equals" => Ok(Self::Equal),
             "notequals" => Ok(Self::NotEqual),
             "indaterange" => Ok(Self::InDateRange),
             "in" => Ok(Self::In),
             "notin" => Ok(Self::NotIn),
             "set" => Ok(Self::Set),
+            "notset" => Ok(Self::NotSet),
             "gt" => Ok(Self::Gt),
             "gte" => Ok(Self::Gte),
             "lt" => Ok(Self::Lt),
@@ -44,6 +47,7 @@ impl FromStr for FilterOperator {
             "notstartswith" => Ok(Self::NotStartsWith),
             "endswith" => Ok(Self::EndsWith),
             "notendswith" => Ok(Self::NotEndsWith),
+            "measurefilter" => Ok(Self::MeasureFilter),
 
             _ => Err(CubeError::user(format!("Unknown filter operator {}", s))),
         }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/common_utils.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/common_utils.rs
index 442700dca0..ea9ba1d53d 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/common_utils.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/common_utils.rs
@@ -1,5 +1,5 @@
 use crate::planner::query_tools::QueryTools;
-use crate::planner::{BaseCube, BaseDimension, BaseMember};
+use crate::planner::{BaseCube, BaseDimension};
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 
@@ -23,7 +23,7 @@ impl CommonUtils {
     pub fn primary_keys_dimensions(
         &self,
         cube_name: &String,
-    ) -> Result<Vec<Rc<dyn BaseMember>>, CubeError> {
+    ) -> Result<Vec<Rc<BaseDimension>>, CubeError> {
         let evaluator_compiler_cell = self.query_tools.evaluator_compiler().clone();
         let mut evaluator_compiler = evaluator_compiler_cell.borrow_mut();
         let primary_keys = self
@@ -32,7 +32,8 @@ impl CommonUtils {
             .static_data()
             .primary_keys
             .get(cube_name)
-            .unwrap();
+            .cloned()
+            .unwrap_or_else(|| vec![]);
 
         let dims = primary_keys
             .iter()
@@ -40,7 +41,7 @@ impl CommonUtils {
                 let full_name = format!("{}.{}", cube_name, d);
                 let evaluator = evaluator_compiler.add_dimension_evaluator(full_name.clone())?;
                 let dim = BaseDimension::try_new_required(evaluator, self.query_tools.clone())?;
-                Ok(dim.as_base_member())
+                Ok(dim)
             })
             .collect::<Result<Vec<_>, _>>()?;
         Ok(dims)
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/dimension_subquery_planner.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/dimension_subquery_planner.rs
new file mode 100644
index 0000000000..110b36ef9b
--- /dev/null
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/dimension_subquery_planner.rs
@@ -0,0 +1,204 @@
+use super::{CommonUtils, QueryPlanner};
+use crate::plan::{Expr, FilterItem, JoinBuilder, JoinCondition, QualifiedColumnName};
+use crate::planner::query_tools::QueryTools;
+use crate::planner::sql_evaluator::collectors::collect_sub_query_dimensions;
+use crate::planner::QueryProperties;
+use crate::planner::{BaseDimension, BaseMeasure, BaseMember};
+use cubenativeutils::CubeError;
+use itertools::Itertools;
+use std::cell::{Ref, RefCell};
+use std::collections::HashMap;
+use std::rc::Rc;
+
+pub struct DimensionSubqueryPlanner {
+    utils: CommonUtils,
+    query_tools: Rc<QueryTools>,
+    query_properties: Rc<QueryProperties>,
+    sub_query_dims: HashMap<String, Vec<Rc<BaseDimension>>>,
+    dimensions_refs: RefCell<HashMap<String, QualifiedColumnName>>,
+}
+
+impl DimensionSubqueryPlanner {
+    pub fn empty(query_tools: Rc<QueryTools>, query_properties: Rc<QueryProperties>) -> Self {
+        Self {
+            sub_query_dims: HashMap::new(),
+            utils: CommonUtils::new(query_tools.clone()),
+            query_tools,
+            query_properties,
+            dimensions_refs: RefCell::new(HashMap::new()),
+        }
+    }
+    pub fn try_new(
+        dimensions: &Vec<Rc<BaseDimension>>,
+        query_tools: Rc<QueryTools>,
+        query_properties: Rc<QueryProperties>,
+    ) -> Result<Self, CubeError> {
+        let mut sub_query_dims: HashMap<String, Vec<Rc<BaseDimension>>> = HashMap::new();
+        for subquery_dimension in dimensions.iter() {
+            let cube_name = subquery_dimension.cube_name().clone();
+            sub_query_dims
+                .entry(cube_name.clone())
+                .or_default()
+                .push(subquery_dimension.clone());
+        }
+
+        Ok(Self {
+            sub_query_dims,
+            utils: CommonUtils::new(query_tools.clone()),
+            query_tools,
+            query_properties,
+            dimensions_refs: RefCell::new(HashMap::new()),
+        })
+    }
+
+    pub fn add_joins_for_cube(
+        &self,
+        builder: &mut JoinBuilder,
+        cube_name: &String,
+    ) -> Result<(), CubeError> {
+        if let Some(sub_query_dims) = self.sub_query_dims.get(cube_name) {
+            let primary_keys_dimensions = self.utils.primary_keys_dimensions(cube_name)?;
+            for dim in sub_query_dims.iter() {
+                self.add_join_impl(builder, cube_name, &primary_keys_dimensions, dim.clone())?
+            }
+        }
+        Ok(())
+    }
+
+    pub fn add_join(
+        &self,
+        builder: &mut JoinBuilder,
+        subquery_dimension: Rc<BaseDimension>,
+    ) -> Result<(), CubeError> {
+        let cube_name = subquery_dimension.cube_name();
+        let primary_keys_dimensions = self.utils.primary_keys_dimensions(cube_name)?;
+        self.add_join_impl(
+            builder,
+            cube_name,
+            &primary_keys_dimensions,
+            subquery_dimension.clone(),
+        )
+    }
+
+    fn add_join_impl(
+        &self,
+        builder: &mut JoinBuilder,
+        cube_name: &String,
+        primary_keys_dimensions: &Vec<Rc<BaseDimension>>,
+        subquery_dimension: Rc<BaseDimension>,
+    ) -> Result<(), CubeError> {
+        let dim_name = subquery_dimension.name();
+        let dim_full_name = subquery_dimension.full_name();
+        let expression = subquery_dimension.sql_call()?;
+        let measure = BaseMeasure::try_new_from_expression(
+            expression,
+            cube_name.clone(),
+            dim_name.clone(),
+            None,
+            self.query_tools.clone(),
+        )?;
+
+        let (dimensions_filters, time_dimensions_filters) = if subquery_dimension
+            .propagate_filters_to_sub_query()
+        {
+            let dimensions_filters = self
+                .extract_filters_without_subqueries(self.query_properties.dimensions_filters())?;
+            let time_dimensions_filters = self.extract_filters_without_subqueries(
+                self.query_properties.time_dimensions_filters(),
+            )?;
+            (dimensions_filters, time_dimensions_filters)
+        } else {
+            (vec![], vec![])
+        };
+
+        let sub_query_properties = QueryProperties::try_new_from_precompiled(
+            self.query_tools.clone(),
+            vec![measure], //measures,
+            primary_keys_dimensions.clone(),
+            vec![],
+            time_dimensions_filters,
+            dimensions_filters,
+            vec![],
+            vec![],
+            None,
+            None,
+            true,
+            false,
+        )?;
+        let query_planner = QueryPlanner::new(sub_query_properties, self.query_tools.clone());
+        let sub_query = query_planner.plan()?;
+        let sub_query_alias = format!("{cube_name}_{dim_name}_subquery");
+
+        let conditions = primary_keys_dimensions
+            .iter()
+            .map(|dim| {
+                let dim = dim.clone().as_base_member();
+                let alias_in_sub_query = sub_query.schema().resolve_member_alias(&dim);
+                let sub_query_ref = Expr::Reference(QualifiedColumnName::new(
+                    Some(sub_query_alias.clone()),
+                    alias_in_sub_query.clone(),
+                ));
+
+                vec![(sub_query_ref, Expr::new_member(dim))]
+            })
+            .collect_vec();
+
+        if let Some(dim_ref) = sub_query.schema().resolve_member_reference(&dim_full_name) {
+            let qualified_column_name =
+                QualifiedColumnName::new(Some(sub_query_alias.clone()), dim_ref);
+            self.dimensions_refs
+                .borrow_mut()
+                .insert(dim_full_name.clone(), qualified_column_name);
+        } else {
+            return Err(CubeError::internal(format!(
+                "Can't find source for subquery dimension {}",
+                dim_name
+            )));
+        }
+
+        builder.left_join_subselect(
+            sub_query,
+            sub_query_alias,
+            JoinCondition::new_dimension_join(conditions, false),
+        );
+        Ok(())
+    }
+
+    fn extract_filters_without_subqueries(
+        &self,
+        filters: &Vec<FilterItem>,
+    ) -> Result<Vec<FilterItem>, CubeError> {
+        let mut result = vec![];
+        for item in filters.iter() {
+            if self.is_filter_without_subqueries(item)? {
+                result.push(item.clone());
+            }
+        }
+
+        Ok(result)
+    }
+
+    fn is_filter_without_subqueries(&self, filter_item: &FilterItem) -> Result<bool, CubeError> {
+        match filter_item {
+            FilterItem::Group(group) => {
+                for item in group.items.iter() {
+                    if !self.is_filter_without_subqueries(item)? {
+                        return Ok(false);
+                    }
+                }
+                Ok(true)
+            }
+            FilterItem::Item(filter_item) => {
+                Ok(collect_sub_query_dimensions(&filter_item.member_evaluator())?.is_empty())
+            }
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.sub_query_dims.is_empty()
+    }
+
+    pub fn dimensions_refs(&self) -> Ref<HashMap<String, QualifiedColumnName>> {
+        self.dimensions_refs.borrow()
+    }
+}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/full_key_query_aggregate_planner.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/full_key_query_aggregate_planner.rs
index fdb9179554..a89db3fe23 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/full_key_query_aggregate_planner.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/full_key_query_aggregate_planner.rs
@@ -35,7 +35,7 @@ impl FullKeyAggregateQueryPlanner {
         }
     }
 
-    pub fn plan(self, joins: Vec<Rc<Select>>, ctes: Vec<Rc<Cte>>) -> Result<Select, CubeError> {
+    pub fn plan(self, joins: Vec<Rc<Select>>, ctes: Vec<Rc<Cte>>) -> Result<Rc<Select>, CubeError> {
         if self.query_properties.is_simple_query()? {
             return Err(CubeError::internal(format!(
                 "FullKeyAggregateQueryPlanner should not be used for simple query"
@@ -56,7 +56,7 @@ impl FullKeyAggregateQueryPlanner {
         outer_measures: &Vec<Rc<BaseMeasure>>,
         joins: Vec<Rc<Select>>,
         ctes: Vec<Rc<Cte>>,
-    ) -> Result<Select, CubeError> {
+    ) -> Result<Rc<Select>, CubeError> {
         let mut join_builder = JoinBuilder::new_from_subselect(joins[0].clone(), format!("q_0"));
         let dimensions_to_select = self.query_properties.dimensions_for_select();
         for (i, join) in joins.iter().enumerate().skip(1) {
@@ -151,7 +151,7 @@ impl FullKeyAggregateQueryPlanner {
         };
 
         select_builder.set_order_by(self.order_planner.default_order());
-        select_builder.set_having(having);
+        select_builder.set_filter(having);
         select_builder.set_limit(self.query_properties.row_limit());
         select_builder.set_offset(self.query_properties.offset());
         if !ctes.is_empty() {
@@ -161,6 +161,6 @@ impl FullKeyAggregateQueryPlanner {
         let mut context_factory = self.context_factory.clone();
         context_factory.set_render_references(render_references);
 
-        Ok(select_builder.build(context_factory))
+        Ok(Rc::new(select_builder.build(context_factory)))
     }
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/join_planner.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/join_planner.rs
index 6a0bab5378..1c1c340ecf 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/join_planner.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/join_planner.rs
@@ -1,6 +1,7 @@
-use super::CommonUtils;
+use super::{CommonUtils, DimensionSubqueryPlanner};
 use crate::cube_bridge::join_definition::JoinDefinition;
-use crate::cube_bridge::memeber_sql::MemberSql;
+use crate::cube_bridge::join_hints::JoinHintItem;
+use crate::cube_bridge::member_sql::MemberSql;
 use crate::plan::{From, JoinBuilder, JoinCondition};
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::SqlCall;
@@ -24,27 +25,30 @@ impl JoinPlanner {
     pub fn make_join_node_with_prefix_and_join_hints(
         &self,
         alias_prefix: &Option<String>, /*TODO dimensions for subqueries*/
-        join_hints: Vec<String>,
+        join_hints: Vec<JoinHintItem>,
+        dimension_subquery_planner: &DimensionSubqueryPlanner,
     ) -> Result<Rc<From>, CubeError> {
         let join = self.query_tools.join_graph().build_join(join_hints)?;
-        self.make_join_node_impl(alias_prefix, join)
+        self.make_join_node_impl(alias_prefix, join, dimension_subquery_planner)
     }
 
     pub fn make_join_node_impl(
         &self,
         alias_prefix: &Option<String>,
         join: Rc<dyn JoinDefinition>,
+        dimension_subquery_planner: &DimensionSubqueryPlanner,
     ) -> Result<Rc<From>, CubeError> {
         let root = self.utils.cube_from_path(join.static_data().root.clone())?;
         let joins = join.joins()?;
-        if joins.items().is_empty() {
+        if joins.is_empty() && dimension_subquery_planner.is_empty() {
             Ok(From::new_from_cube(root, None))
         } else {
             let mut join_builder = JoinBuilder::new_from_cube(
                 root.clone(),
                 Some(root.default_alias_with_prefix(alias_prefix)),
             );
-            for join in joins.items().iter() {
+            dimension_subquery_planner.add_joins_for_cube(&mut join_builder, root.name())?;
+            for join in joins.iter() {
                 let definition = join.join()?;
                 let sql_call = self
                     .compile_join_condition(&join.static_data().original_from, definition.sql()?)?;
@@ -60,6 +64,7 @@ impl JoinPlanner {
                     Some(cube.default_alias_with_prefix(alias_prefix)),
                     on,
                 );
+                dimension_subquery_planner.add_joins_for_cube(&mut join_builder, cube.name())?;
             }
             let result = From::new_from_join(join_builder.build());
             Ok(result)
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/mod.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/mod.rs
index 8356778b08..72f0fba465 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/mod.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/mod.rs
@@ -1,16 +1,20 @@
 pub mod common_utils;
+pub mod dimension_subquery_planner;
 pub mod full_key_query_aggregate_planner;
 pub mod join_planner;
 pub mod multi_stage;
 pub mod multi_stage_query_planner;
 pub mod multiplied_measures_query_planner;
 pub mod order_planner;
+pub mod query_planner;
 pub mod simple_query_planer;
 
 pub use common_utils::CommonUtils;
+pub use dimension_subquery_planner::DimensionSubqueryPlanner;
 pub use full_key_query_aggregate_planner::FullKeyAggregateQueryPlanner;
 pub use join_planner::JoinPlanner;
 pub use multi_stage_query_planner::MultiStageQueryPlanner;
 pub use multiplied_measures_query_planner::MultipliedMeasuresQueryPlanner;
 pub use order_planner::OrderPlanner;
+pub use query_planner::QueryPlanner;
 pub use simple_query_planer::SimpleQueryPlanner;
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/applied_state.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/applied_state.rs
index 7a4061c43f..a60b755293 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/applied_state.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/applied_state.rs
@@ -160,26 +160,43 @@ impl MultiStageAppliedState {
         false
     }
 
-    pub fn expand_date_range_filter(
+    pub fn replace_regular_date_range_filter(
         &mut self,
         member_name: &String,
         left_interval: Option<String>,
         right_interval: Option<String>,
     ) {
-        self.time_dimensions_filters = self.expand_date_range_filter_impl(
+        let operator = FilterOperator::RegularRollingWindowDateRange;
+        let values = vec![left_interval.clone(), right_interval.clone()];
+        self.time_dimensions_filters = self.change_date_range_filter_impl(
             member_name,
             &self.time_dimensions_filters,
-            &left_interval,
-            &right_interval,
+            &operator,
+            &values,
         );
     }
 
-    fn expand_date_range_filter_impl(
+    pub fn replace_to_date_date_range_filter(
+        &mut self,
+        member_name: &String,
+        granularity: &String,
+    ) {
+        let operator = FilterOperator::ToDateRollingWindowDateRange;
+        let values = vec![Some(granularity.clone())];
+        self.time_dimensions_filters = self.change_date_range_filter_impl(
+            member_name,
+            &self.time_dimensions_filters,
+            &operator,
+            &values,
+        );
+    }
+
+    fn change_date_range_filter_impl(
         &self,
         member_name: &String,
         filters: &Vec<FilterItem>,
-        left_interval: &Option<String>,
-        right_interval: &Option<String>,
+        operator: &FilterOperator,
+        additional_values: &Vec<Option<String>>,
     ) -> Vec<FilterItem> {
         let mut result = Vec::new();
         for item in filters.iter() {
@@ -187,11 +204,11 @@ impl MultiStageAppliedState {
                 FilterItem::Group(group) => {
                     let new_group = FilterItem::Group(Rc::new(FilterGroup::new(
                         group.operator.clone(),
-                        self.expand_date_range_filter_impl(
+                        self.change_date_range_filter_impl(
                             member_name,
                             filters,
-                            left_interval,
-                            right_interval,
+                            operator,
+                            additional_values,
                         ),
                     )));
                     result.push(new_group);
@@ -201,9 +218,8 @@ impl MultiStageAppliedState {
                         && matches!(itm.filter_operator(), FilterOperator::InDateRange)
                     {
                         let mut values = itm.values().clone();
-                        values.push(left_interval.clone());
-                        values.push(right_interval.clone());
-                        itm.change_operator(FilterOperator::InDateRangeExtended, values)
+                        values.extend(additional_values.iter().cloned());
+                        itm.change_operator(operator.clone(), values)
                     } else {
                         itm.clone()
                     };
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/member.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/member.rs
index e7e97dc849..de7b566469 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/member.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/member.rs
@@ -66,13 +66,55 @@ pub enum MultiStageLeafMemberType {
 }
 
 #[derive(Clone)]
-pub struct RollingWindowDescription {
-    pub time_dimension: Rc<dyn BaseMember>,
+pub struct RegularRollingWindow {
     pub trailing: Option<String>,
     pub leading: Option<String>,
     pub offset: String,
 }
 
+#[derive(Clone)]
+pub struct ToDateRollingWindow {
+    pub granularity: String,
+}
+
+#[derive(Clone)]
+pub enum RollingWindowType {
+    Regular(RegularRollingWindow),
+    ToDate(ToDateRollingWindow),
+}
+
+#[derive(Clone)]
+pub struct RollingWindowDescription {
+    pub time_dimension: Rc<dyn BaseMember>,
+    pub rolling_window: RollingWindowType,
+}
+
+impl RollingWindowDescription {
+    pub fn new_regular(
+        time_dimension: Rc<dyn BaseMember>,
+        trailing: Option<String>,
+        leading: Option<String>,
+        offset: String,
+    ) -> Self {
+        let regular_window = RegularRollingWindow {
+            trailing,
+            leading,
+            offset,
+        };
+        Self {
+            time_dimension,
+            rolling_window: RollingWindowType::Regular(regular_window),
+        }
+    }
+
+    pub fn new_to_date(time_dimension: Rc<dyn BaseMember>, granularity: String) -> Self {
+        Self {
+            time_dimension,
+            rolling_window: RollingWindowType::ToDate(ToDateRollingWindow { granularity }),
+        }
+    }
+}
+
 #[derive(Clone)]
 pub struct RunningTotalDescription {
     pub time_dimension: Rc<dyn BaseMember>,
@@ -94,7 +136,6 @@ pub struct MultiStageInodeMember {
     add_group_by: Vec<String>,
     group_by: Option<Vec<String>>,
     time_shifts: Vec<MultiStageTimeShift>,
-    is_ungrupped: bool,
 }
 
 impl MultiStageInodeMember {
@@ -104,7 +145,6 @@ impl MultiStageInodeMember {
         add_group_by: Vec<String>,
         group_by: Option<Vec<String>>,
         time_shifts: Vec<MultiStageTimeShift>,
-        is_ungrupped: bool,
     ) -> Self {
         Self {
             inode_type,
@@ -112,7 +152,6 @@ impl MultiStageInodeMember {
             add_group_by,
             group_by,
             time_shifts,
-            is_ungrupped,
         }
     }
 
@@ -135,10 +174,6 @@ impl MultiStageInodeMember {
     pub fn time_shifts(&self) -> &Vec<MultiStageTimeShift> {
         &self.time_shifts
     }
-
-    pub fn is_ungrupped(&self) -> bool {
-        self.is_ungrupped
-    }
 }
 
 #[derive(Clone)]
@@ -150,13 +185,22 @@ pub enum MultiStageMemberType {
 pub struct MultiStageMember {
     member_type: MultiStageMemberType,
     evaluation_node: Rc<MemberSymbol>,
+    is_ungrupped: bool,
+    has_aggregates_on_top: bool,
 }
 
 impl MultiStageMember {
-    pub fn new(member_type: MultiStageMemberType, evaluation_node: Rc<MemberSymbol>) -> Rc<Self> {
+    pub fn new(
+        member_type: MultiStageMemberType,
+        evaluation_node: Rc<MemberSymbol>,
+        is_ungrupped: bool,
+        has_aggregates_on_top: bool,
+    ) -> Rc<Self> {
         Rc::new(Self {
             member_type,
             evaluation_node,
+            is_ungrupped,
+            has_aggregates_on_top,
         })
     }
 
@@ -171,4 +215,12 @@ impl MultiStageMember {
     pub fn full_name(&self) -> String {
         self.evaluation_node.full_name()
     }
+
+    pub fn is_ungrupped(&self) -> bool {
+        self.is_ungrupped
+    }
+
+    pub fn has_aggregates_on_top(&self) -> bool {
+        self.has_aggregates_on_top
+    }
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/member_query_planner.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/member_query_planner.rs
index fd0c237164..c673c91fab 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/member_query_planner.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/member_query_planner.rs
@@ -6,13 +6,10 @@ use crate::plan::{
     Cte, Expr, From, JoinBuilder, JoinCondition, MemberExpression, OrderBy, QualifiedColumnName,
     QueryPlan, Schema, SelectBuilder, TimeSeries,
 };
-use crate::planner::planners::{
-    FullKeyAggregateQueryPlanner, MultipliedMeasuresQueryPlanner, OrderPlanner, SimpleQueryPlanner,
-};
+use crate::planner::planners::{multi_stage::RollingWindowType, OrderPlanner, QueryPlanner};
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::sql_nodes::SqlNodesFactory;
 use crate::planner::sql_evaluator::ReferencesBuilder;
-use crate::planner::sql_templates::PlanSqlTemplates;
 use crate::planner::QueryProperties;
 use crate::planner::{BaseDimension, BaseMeasure, BaseMember, BaseMemberHelper, BaseTimeDimension};
 use cubenativeutils::CubeError;
@@ -105,16 +102,31 @@ impl MultiStageMemberQueryPlanner {
         let rolling_base_cte_schema = cte_schemas.get(input).unwrap().clone();
         let time_dimension_alias =
             rolling_base_cte_schema.resolve_member_alias(&rolling_window_desc.time_dimension);
-        let on = JoinCondition::new_rolling_join(
-            root_alias.clone(),
-            rolling_window_desc.trailing.clone(),
-            rolling_window_desc.leading.clone(),
-            rolling_window_desc.offset.clone(),
-            Expr::Reference(QualifiedColumnName::new(
-                Some(alias.clone()),
-                time_dimension_alias,
-            )),
-        );
+        let on = match &rolling_window_desc.rolling_window {
+            RollingWindowType::Regular(regular_rolling_window) => {
+                JoinCondition::new_regular_rolling_join(
+                    root_alias.clone(),
+                    regular_rolling_window.trailing.clone(),
+                    regular_rolling_window.leading.clone(),
+                    regular_rolling_window.offset.clone(),
+                    Expr::Reference(QualifiedColumnName::new(
+                        Some(alias.clone()),
+                        time_dimension_alias,
+                    )),
+                )
+            }
+            RollingWindowType::ToDate(to_date_rolling_window) => {
+                JoinCondition::new_to_date_rolling_join(
+                    root_alias.clone(),
+                    to_date_rolling_window.granularity.clone(),
+                    Expr::Reference(QualifiedColumnName::new(
+                        Some(alias.clone()),
+                        time_dimension_alias,
+                    )),
+                    self.query_tools.clone(),
+                )
+            }
+        };
         join_builder.left_join_table_reference(
             input.clone(),
             rolling_base_cte_schema.clone(),
@@ -124,14 +136,22 @@ impl MultiStageMemberQueryPlanner {
 
         let from = From::new_from_join(join_builder.build());
 
-        let group_by = dimensions
-            .iter()
-            .map(|dim| Expr::Member(MemberExpression::new(dim.clone())))
-            .collect_vec();
+        let group_by = if self.description.member().is_ungrupped() {
+            vec![]
+        } else {
+            dimensions
+                .iter()
+                .map(|dim| Expr::Member(MemberExpression::new(dim.clone())))
+                .collect_vec()
+        };
 
         let mut context_factory = SqlNodesFactory::new();
         context_factory.set_rolling_window(true);
 
+        if self.description.member().is_ungrupped() {
+            context_factory.set_ungrouped(true);
+        }
+
         let references_builder = ReferencesBuilder::new(from.clone());
         let mut render_references = HashMap::new();
         let mut select_builder = SelectBuilder::new(from.clone());
@@ -186,7 +206,7 @@ impl MultiStageMemberQueryPlanner {
             format!("{}_join", self.description.alias()),
         );
 
-        let group_by = if multi_stage_member.is_ungrupped() {
+        let group_by = if self.description.member().is_ungrupped() {
             vec![]
         } else {
             dimensions
@@ -195,7 +215,7 @@ impl MultiStageMemberQueryPlanner {
                 .collect_vec()
         };
 
-        let order_by = if multi_stage_member.is_ungrupped() {
+        let order_by = if self.description.member().is_ungrupped() {
             vec![]
         } else {
             self.query_order()?
@@ -243,6 +263,9 @@ impl MultiStageMemberQueryPlanner {
         select_builder.set_group_by(group_by);
         select_builder.set_order_by(order_by);
         context_factory.set_render_references(render_references);
+        if self.description.member().is_ungrupped() {
+            context_factory.set_ungrouped(true);
+        }
         let select = select_builder.build(context_factory);
 
         Ok(Rc::new(Cte::new_from_select(
@@ -356,44 +379,31 @@ impl MultiStageMemberQueryPlanner {
             None,
             None,
             true,
-            false,
+            self.description.member().is_ungrupped(),
         )?;
 
         let mut node_factory = SqlNodesFactory::new();
         node_factory.set_time_shifts(self.description.state().time_shifts().clone());
+        if self.description.member().has_aggregates_on_top() {
+            node_factory.set_count_approx_as_state(true);
+        }
 
-        /* if cte_query_properties
+        if cte_query_properties
             .full_key_aggregate_measures()?
             .has_multi_stage_measures()
         {
             return Err(CubeError::internal(format!(
                 "Leaf multi stage query cannot contain multi stage member"
             )));
-        } */
+        }
 
-        let cte_select = if cte_query_properties.is_simple_query()? {
-            let planner = SimpleQueryPlanner::new(
-                self.query_tools.clone(),
-                cte_query_properties.clone(),
-                node_factory.clone(),
-            );
-            planner.plan()?
-        } else {
-            let multiplied_measures_query_planner = MultipliedMeasuresQueryPlanner::new(
-                self.query_tools.clone(),
-                cte_query_properties.clone(),
-                node_factory.clone(),
-            );
-            let full_key_aggregate_planner = FullKeyAggregateQueryPlanner::new(
-                cte_query_properties.clone(),
-                node_factory.clone(),
-                PlanSqlTemplates::new(self.query_tools.templates_render()),
-            );
-            let subqueries = multiplied_measures_query_planner.plan_queries()?;
-            let result = full_key_aggregate_planner.plan(subqueries, vec![])?;
-            result
-        };
-        let result = Cte::new_from_select(Rc::new(cte_select), self.description.alias().clone());
+        let query_planner = QueryPlanner::new_with_context_factory(
+            cte_query_properties.clone(),
+            self.query_tools.clone(),
+            node_factory,
+        );
+        let cte_select = query_planner.plan()?;
+        let result = Cte::new_from_select(cte_select, self.description.alias().clone());
         Ok(Rc::new(result))
     }
 
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage_query_planner.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage_query_planner.rs
index 1a2f2955d7..0a9218832c 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage_query_planner.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage_query_planner.rs
@@ -106,7 +106,7 @@ impl MultiStageQueryPlanner {
     fn create_multi_stage_inode_member(
         &self,
         base_member: Rc<MemberSymbol>,
-    ) -> Result<MultiStageInodeMember, CubeError> {
+    ) -> Result<(MultiStageInodeMember, bool), CubeError> {
         let inode = if let Some(measure) =
             BaseMeasure::try_new(base_member.clone(), self.query_tools.clone())?
         {
@@ -129,24 +129,28 @@ impl MultiStageQueryPlanner {
             };
             let is_ungrupped = match &member_type {
                 MultiStageInodeMemberType::Rank | MultiStageInodeMemberType::Calculate => true,
-                _ => false,
+                _ => self.query_properties.ungrouped(),
             };
-            MultiStageInodeMember::new(
-                member_type,
-                measure.reduce_by().clone().unwrap_or_default(),
-                measure.add_group_by().clone().unwrap_or_default(),
-                measure.group_by().clone(),
-                time_shifts,
+            (
+                MultiStageInodeMember::new(
+                    member_type,
+                    measure.reduce_by().clone().unwrap_or_default(),
+                    measure.add_group_by().clone().unwrap_or_default(),
+                    measure.group_by().clone(),
+                    time_shifts,
+                ),
                 is_ungrupped,
             )
         } else {
-            MultiStageInodeMember::new(
-                MultiStageInodeMemberType::Calculate,
-                vec![],
-                vec![],
-                None,
-                vec![],
-                false,
+            (
+                MultiStageInodeMember::new(
+                    MultiStageInodeMemberType::Calculate,
+                    vec![],
+                    vec![],
+                    None,
+                    vec![],
+                ),
+                self.query_properties.ungrouped(),
             )
         };
         Ok(inode)
@@ -168,6 +172,8 @@ impl MultiStageQueryPlanner {
                             time_dimension.clone(),
                         )),
                         time_dimension.member_evaluator(),
+                        true,
+                        false,
                     ),
                     state.clone(),
                     vec![],
@@ -190,6 +196,8 @@ impl MultiStageQueryPlanner {
             MultiStageMember::new(
                 MultiStageMemberType::Leaf(MultiStageLeafMemberType::Measure),
                 member,
+                self.query_properties.ungrouped(),
+                true,
             ),
             state,
             vec![],
@@ -199,6 +207,28 @@ impl MultiStageQueryPlanner {
         Ok(description)
     }
 
+    fn get_to_date_rolling_granularity(
+        &self,
+        rolling_window: &RollingWindow,
+    ) -> Result<Option<String>, CubeError> {
+        let is_to_date = rolling_window
+            .rolling_type
+            .as_ref()
+            .map_or(false, |tp| tp == "to_date");
+
+        if is_to_date {
+            if let Some(granularity) = &rolling_window.granularity {
+                Ok(Some(granularity.clone()))
+            } else {
+                Err(CubeError::user(format!(
+                    "Granularity required for to_date rolling window"
+                )))
+            }
+        } else {
+            Ok(None)
+        }
+    }
+
     fn make_rolling_base_state(
         &self,
         time_dimension: Rc<BaseTimeDimension>,
@@ -220,11 +250,15 @@ impl MultiStageQueryPlanner {
 
         new_state.change_time_dimension_granularity(&time_dimension_name, result_granularity);
 
-        new_state.expand_date_range_filter(
-            &time_dimension_name,
-            rolling_window.trailing.clone(),
-            rolling_window.leading.clone(),
-        );
+        if let Some(granularity) = self.get_to_date_rolling_granularity(rolling_window)? {
+            new_state.replace_to_date_date_range_filter(&time_dimension_name, &granularity);
+        } else {
+            new_state.replace_regular_date_range_filter(
+                &time_dimension_name,
+                rolling_window.trailing.clone(),
+                rolling_window.leading.clone(),
+            );
+        }
 
         Ok(Rc::new(new_state))
     }
@@ -244,6 +278,8 @@ impl MultiStageQueryPlanner {
                         trailing: Some("unbounded".to_string()),
                         leading: None,
                         offset: None,
+                        rolling_type: None,
+                        granularity: None,
                     }
                 };
                 let time_dimensions = self.query_properties.time_dimensions();
@@ -276,11 +312,17 @@ impl MultiStageQueryPlanner {
 
                 let alias = format!("cte_{}", descriptions.len());
 
-                let rolling_window_descr = RollingWindowDescription {
-                    time_dimension: time_dimension.clone(),
-                    trailing: rolling_window.trailing.clone(),
-                    leading: rolling_window.leading.clone(),
-                    offset: rolling_window.offset.clone().unwrap_or("end".to_string()),
+                let rolling_window_descr = if let Some(granularity) =
+                    self.get_to_date_rolling_granularity(&rolling_window)?
+                {
+                    RollingWindowDescription::new_to_date(time_dimension, granularity)
+                } else {
+                    RollingWindowDescription::new_regular(
+                        time_dimension,
+                        rolling_window.trailing.clone(),
+                        rolling_window.leading.clone(),
+                        rolling_window.offset.clone().unwrap_or("end".to_string()),
+                    )
                 };
 
                 let inode_member = MultiStageInodeMember::new(
@@ -289,11 +331,15 @@ impl MultiStageQueryPlanner {
                     vec![],
                     None,
                     vec![],
-                    false,
                 );
 
                 let description = MultiStageQueryDescription::new(
-                    MultiStageMember::new(MultiStageMemberType::Inode(inode_member), member),
+                    MultiStageMember::new(
+                        MultiStageMemberType::Inode(inode_member),
+                        member,
+                        self.query_properties.ungrouped(),
+                        false,
+                    ),
                     state.clone(),
                     input,
                     alias.clone(),
@@ -342,13 +388,16 @@ impl MultiStageQueryPlanner {
                 MultiStageMember::new(
                     MultiStageMemberType::Leaf(MultiStageLeafMemberType::Measure),
                     member.clone(),
+                    self.query_properties.ungrouped(),
+                    false,
                 ),
                 state.clone(),
                 vec![],
                 alias.clone(),
             )
         } else {
-            let multi_stage_member = self.create_multi_stage_inode_member(member.clone())?;
+            let (multi_stage_member, is_ungrupped) =
+                self.create_multi_stage_inode_member(member.clone())?;
 
             let dimensions_to_add = multi_stage_member
                 .add_group_by()
@@ -386,7 +435,12 @@ impl MultiStageQueryPlanner {
 
             let alias = format!("cte_{}", descriptions.len());
             MultiStageQueryDescription::new(
-                MultiStageMember::new(MultiStageMemberType::Inode(multi_stage_member), member),
+                MultiStageMember::new(
+                    MultiStageMemberType::Inode(multi_stage_member),
+                    member,
+                    is_ungrupped,
+                    false,
+                ),
                 state.clone(),
                 input,
                 alias.clone(),
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multiplied_measures_query_planner.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multiplied_measures_query_planner.rs
index 14ecfd86aa..a4508220df 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multiplied_measures_query_planner.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multiplied_measures_query_planner.rs
@@ -1,4 +1,4 @@
-use super::{CommonUtils, JoinPlanner};
+use super::{CommonUtils, DimensionSubqueryPlanner, JoinPlanner};
 use crate::cube_bridge::join_definition::JoinDefinition;
 use crate::plan::{
     Expr, From, JoinBuilder, JoinCondition, MemberExpression, QualifiedColumnName, Select,
@@ -7,10 +7,13 @@ use crate::plan::{
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::collectors::{
     collect_cube_names, collect_join_hints, collect_join_hints_for_measures,
+    collect_sub_query_dimensions_from_members, collect_sub_query_dimensions_from_symbols,
 };
 use crate::planner::sql_evaluator::sql_nodes::SqlNodesFactory;
 use crate::planner::sql_evaluator::ReferencesBuilder;
-use crate::planner::{BaseMeasure, BaseMember, BaseMemberHelper, QueryProperties};
+use crate::planner::{
+    BaseMeasure, BaseMember, BaseMemberHelper, FullKeyAggregateMeasures, QueryProperties,
+};
 use cubenativeutils::CubeError;
 use itertools::Itertools;
 use std::collections::HashMap;
@@ -22,21 +25,24 @@ pub struct MultipliedMeasuresQueryPlanner {
     join_planner: JoinPlanner,
     common_utils: CommonUtils,
     context_factory: SqlNodesFactory,
+    full_key_aggregate_measures: FullKeyAggregateMeasures,
 }
 
 impl MultipliedMeasuresQueryPlanner {
-    pub fn new(
+    pub fn try_new(
         query_tools: Rc<QueryTools>,
         query_properties: Rc<QueryProperties>,
         context_factory: SqlNodesFactory,
-    ) -> Self {
-        Self {
+    ) -> Result<Self, CubeError> {
+        let full_key_aggregate_measures = query_properties.full_key_aggregate_measures()?;
+        Ok(Self {
             query_tools: query_tools.clone(),
             join_planner: JoinPlanner::new(query_tools.clone()),
             common_utils: CommonUtils::new(query_tools.clone()),
             query_properties,
             context_factory,
-        }
+            full_key_aggregate_measures,
+        })
     }
 
     pub fn plan_queries(&self) -> Result<Vec<Rc<Select>>, CubeError> {
@@ -46,14 +52,16 @@ impl MultipliedMeasuresQueryPlanner {
             )));
         }
 
-        let measures = self.query_properties.full_key_aggregate_measures()?;
+        let full_key_aggregate_measures = &self.full_key_aggregate_measures;
 
         let mut joins = Vec::new();
 
-        if !measures.regular_measures.is_empty() {
+        if !full_key_aggregate_measures.regular_measures.is_empty() {
             let join_multi_fact_groups = self
                 .query_properties
-                .compute_join_multi_fact_groups_with_measures(&measures.regular_measures)?;
+                .compute_join_multi_fact_groups_with_measures(
+                    &full_key_aggregate_measures.regular_measures,
+                )?;
             for (i, (join, measures)) in join_multi_fact_groups.iter().enumerate() {
                 let regular_subquery = self.regular_measures_subquery(
                     measures,
@@ -68,7 +76,7 @@ impl MultipliedMeasuresQueryPlanner {
             }
         }
 
-        for (cube_name, measures) in measures
+        for (cube_name, measures) in full_key_aggregate_measures
             .multiplied_measures
             .clone()
             .into_iter()
@@ -101,7 +109,23 @@ impl MultipliedMeasuresQueryPlanner {
         measures: &Vec<Rc<BaseMeasure>>,
         key_join: Rc<dyn JoinDefinition>,
     ) -> Result<Rc<Select>, CubeError> {
-        let primary_keys_dimensions = self.common_utils.primary_keys_dimensions(key_cube_name)?;
+        let subquery_dimensions = collect_sub_query_dimensions_from_members(
+            &BaseMemberHelper::iter_as_base_member(measures).collect_vec(),
+            self.query_tools.clone(),
+        )?;
+
+        let dimension_subquery_planner = DimensionSubqueryPlanner::try_new(
+            &subquery_dimensions,
+            self.query_tools.clone(),
+            self.query_properties.clone(),
+        )?;
+
+        let primary_keys_dimensions = self
+            .common_utils
+            .primary_keys_dimensions(key_cube_name)?
+            .into_iter()
+            .map(|d| d.as_base_member())
+            .collect_vec();
         let keys_query = self.key_query(&primary_keys_dimensions, key_join, key_cube_name)?;
         let keys_query_alias = format!("keys");
         let should_build_join_for_measure_select =
@@ -112,13 +136,14 @@ impl MultipliedMeasuresQueryPlanner {
 
         let pk_cube = self.common_utils.cube_from_path(key_cube_name.clone())?;
         let pk_cube_alias =
-            pk_cube.default_alias_with_prefix(&Some(format!("{key_cube_name}_key")));
+            pk_cube.default_alias_with_prefix(&Some(format!("{}_key", pk_cube.default_alias())));
         let mut ungrouped_measure_references = HashMap::new();
         if should_build_join_for_measure_select {
             let subquery = self.aggregate_subquery_measure_join(
                 key_cube_name,
                 &measures,
                 &primary_keys_dimensions,
+                &dimension_subquery_planner,
             )?;
 
             let conditions = primary_keys_dimensions
@@ -173,12 +198,15 @@ impl MultipliedMeasuresQueryPlanner {
                 Some(pk_cube_alias.clone()),
                 JoinCondition::new_dimension_join(conditions, false),
             );
+            for sub_dim in subquery_dimensions.iter() {
+                dimension_subquery_planner.add_join(&mut join_builder, sub_dim.clone())?;
+            }
         };
 
         let from = From::new_from_join(join_builder.build());
         let references_builder = ReferencesBuilder::new(from.clone());
         let mut select_builder = SelectBuilder::new(from.clone());
-        let mut render_references = HashMap::new();
+        let mut render_references = dimension_subquery_planner.dimensions_refs().clone();
         for member in self
             .query_properties
             .all_dimensions_and_measures(&vec![])?
@@ -209,6 +237,11 @@ impl MultipliedMeasuresQueryPlanner {
         let mut context_factory = self.context_factory.clone();
         context_factory.set_render_references(render_references);
         context_factory.set_ungrouped_measure_references(ungrouped_measure_references);
+        context_factory.set_rendered_as_multiplied_measures(
+            self.full_key_aggregate_measures
+                .rendered_as_multiplied_measures
+                .clone(),
+        );
         Ok(Rc::new(select_builder.build(context_factory)))
     }
 
@@ -241,13 +274,26 @@ impl MultipliedMeasuresQueryPlanner {
         _key_cube_name: &String,
         measures: &Vec<Rc<BaseMeasure>>,
         primary_keys_dimensions: &Vec<Rc<dyn BaseMember>>,
+        dimension_subquery_planner: &DimensionSubqueryPlanner,
     ) -> Result<Rc<Select>, CubeError> {
         let join_hints = collect_join_hints_for_measures(measures)?;
         let from = self
             .join_planner
-            .make_join_node_with_prefix_and_join_hints(&None, join_hints)?;
+            .make_join_node_with_prefix_and_join_hints(
+                &None,
+                join_hints,
+                &dimension_subquery_planner,
+            )?;
         let mut context_factory = self.context_factory.clone();
         context_factory.set_ungrouped_measure(true);
+        context_factory.set_render_references(dimension_subquery_planner.dimensions_refs().clone());
+
+        context_factory.set_rendered_as_multiplied_measures(
+            self.full_key_aggregate_measures
+                .rendered_as_multiplied_measures
+                .clone(),
+        );
+
         let mut select_builder = SelectBuilder::new(from);
         for dim in primary_keys_dimensions.iter() {
             select_builder.add_projection_member(dim, None);
@@ -264,17 +310,24 @@ impl MultipliedMeasuresQueryPlanner {
         join: Rc<dyn JoinDefinition>,
         alias_prefix: String,
     ) -> Result<Rc<Select>, CubeError> {
-        let source = self
-            .join_planner
-            .make_join_node_impl(&Some(alias_prefix), join)?;
+        let subquery_dimensions = collect_sub_query_dimensions_from_symbols(
+            &self.query_properties.all_member_symbols(false),
+            self.query_tools.clone(),
+        )?;
+
+        let dimension_subquery_planner = DimensionSubqueryPlanner::try_new(
+            &subquery_dimensions,
+            self.query_tools.clone(),
+            self.query_properties.clone(),
+        )?;
+        let source = self.join_planner.make_join_node_impl(
+            &Some(alias_prefix),
+            join,
+            &dimension_subquery_planner,
+        )?;
 
         let mut select_builder = SelectBuilder::new(source.clone());
         let mut context_factory = self.context_factory.clone();
-        for time_dim in self.query_properties.time_dimensions() {
-            if let Some(granularity) = time_dim.get_granularity() {
-                context_factory.add_leaf_time_dimension(&time_dim.full_name(), &granularity);
-            }
-        }
 
         for member in self
             .query_properties
@@ -286,6 +339,15 @@ impl MultipliedMeasuresQueryPlanner {
         let filter = self.query_properties.all_filters();
         select_builder.set_filter(filter);
         select_builder.set_group_by(self.query_properties.group_by());
+
+        let render_references = dimension_subquery_planner.dimensions_refs().clone();
+        context_factory.set_render_references(render_references);
+        context_factory.set_rendered_as_multiplied_measures(
+            self.full_key_aggregate_measures
+                .rendered_as_multiplied_measures
+                .clone(),
+        );
+
         Ok(Rc::new(select_builder.build(context_factory)))
     }
 
@@ -295,20 +357,50 @@ impl MultipliedMeasuresQueryPlanner {
         key_join: Rc<dyn JoinDefinition>,
         key_cube_name: &String,
     ) -> Result<Rc<Select>, CubeError> {
-        let source = self
-            .join_planner
-            .make_join_node_impl(&Some(format!("{}_key", key_cube_name)), key_join)?;
         let dimensions = self
             .query_properties
             .dimensions_for_select_append(dimensions);
 
+        let mut symbols_for_subquery_dimensions =
+            BaseMemberHelper::extract_symbols_from_members(&dimensions);
+        for item in self.query_properties.dimensions_filters() {
+            item.find_all_member_evaluators(&mut symbols_for_subquery_dimensions);
+        }
+
+        for item in self.query_properties.measures_filters() {
+            item.find_all_member_evaluators(&mut symbols_for_subquery_dimensions);
+        }
+
+        let symbols_for_subquery_dimensions = symbols_for_subquery_dimensions
+            .into_iter()
+            .unique_by(|m| m.full_name())
+            .collect_vec();
+
+        let subquery_dimensions = collect_sub_query_dimensions_from_symbols(
+            &symbols_for_subquery_dimensions,
+            self.query_tools.clone(),
+        )?;
+
+        let dimension_subquery_planner = DimensionSubqueryPlanner::try_new(
+            &subquery_dimensions,
+            self.query_tools.clone(),
+            self.query_properties.clone(),
+        )?;
+
+        let source = self.join_planner.make_join_node_impl(
+            &Some(format!(
+                "{}_key",
+                self.query_tools.alias_for_cube(key_cube_name)?
+            )),
+            key_join,
+            &dimension_subquery_planner,
+        )?;
+
         let mut select_builder = SelectBuilder::new(source);
         let mut context_factory = self.context_factory.clone();
-        for time_dim in self.query_properties.time_dimensions() {
-            if let Some(granularity) = time_dim.get_granularity() {
-                context_factory.add_leaf_time_dimension(&time_dim.full_name(), &granularity);
-            }
-        }
+
+        context_factory.set_render_references(dimension_subquery_planner.dimensions_refs().clone());
+
         for member in dimensions.iter() {
             select_builder.add_projection_member(&member, None);
         }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/query_planner.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/query_planner.rs
new file mode 100644
index 0000000000..5780daf4e7
--- /dev/null
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/query_planner.rs
@@ -0,0 +1,85 @@
+use super::{
+    FullKeyAggregateQueryPlanner, MultiStageQueryPlanner, MultipliedMeasuresQueryPlanner,
+    SimpleQueryPlanner,
+};
+use crate::plan::Select;
+use crate::planner::query_tools::QueryTools;
+use crate::planner::sql_evaluator::sql_nodes::SqlNodesFactory;
+use crate::planner::sql_templates::PlanSqlTemplates;
+use crate::planner::QueryProperties;
+use cubenativeutils::CubeError;
+use std::rc::Rc;
+
+pub struct QueryPlanner {
+    query_tools: Rc<QueryTools>,
+    request: Rc<QueryProperties>,
+    context_factory: Option<SqlNodesFactory>,
+}
+
+impl QueryPlanner {
+    pub fn new(request: Rc<QueryProperties>, query_tools: Rc<QueryTools>) -> Self {
+        Self {
+            request,
+            query_tools,
+            context_factory: None,
+        }
+    }
+
+    pub fn new_with_context_factory(
+        request: Rc<QueryProperties>,
+        query_tools: Rc<QueryTools>,
+        context_factory: SqlNodesFactory,
+    ) -> Self {
+        Self {
+            request,
+            query_tools,
+            context_factory: Some(context_factory),
+        }
+    }
+
+    pub fn plan(&self) -> Result<Rc<Select>, CubeError> {
+        let templates = PlanSqlTemplates::new(self.query_tools.templates_render());
+        self.build_sql_impl(templates)
+    }
+
+    fn build_sql_impl(&self, templates: PlanSqlTemplates) -> Result<Rc<Select>, CubeError> {
+        let mut nodes_factory = if let Some(context_factory) = &self.context_factory {
+            context_factory.clone()
+        } else {
+            SqlNodesFactory::new()
+        };
+
+        if self.request.ungrouped() {
+            nodes_factory.set_ungrouped(true)
+        }
+
+        if self.request.is_simple_query()? {
+            let planner = SimpleQueryPlanner::new(
+                self.query_tools.clone(),
+                self.request.clone(),
+                nodes_factory.clone(),
+            );
+            planner.plan()
+        } else {
+            let request = self.request.clone();
+            let multiplied_measures_query_planner = MultipliedMeasuresQueryPlanner::try_new(
+                self.query_tools.clone(),
+                request.clone(),
+                nodes_factory.clone(),
+            )?;
+            let multi_stage_query_planner =
+                MultiStageQueryPlanner::new(self.query_tools.clone(), request.clone());
+            let full_key_aggregate_planner = FullKeyAggregateQueryPlanner::new(
+                request.clone(),
+                nodes_factory.clone(),
+                templates,
+            );
+            let mut subqueries = multiplied_measures_query_planner.plan_queries()?;
+            let (multi_stage_ctes, multi_stage_subqueries) =
+                multi_stage_query_planner.plan_queries()?;
+            subqueries.extend(multi_stage_subqueries.into_iter());
+            let result = full_key_aggregate_planner.plan(subqueries, multi_stage_ctes)?;
+            Ok(result)
+        }
+    }
+}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/simple_query_planer.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/simple_query_planer.rs
index 9ed024a96d..cf7d79475b 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/simple_query_planer.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/simple_query_planer.rs
@@ -1,12 +1,14 @@
-use super::{JoinPlanner, OrderPlanner};
+use super::{DimensionSubqueryPlanner, JoinPlanner, OrderPlanner};
 use crate::plan::{Filter, Select, SelectBuilder};
 use crate::planner::query_tools::QueryTools;
+use crate::planner::sql_evaluator::collectors::collect_sub_query_dimensions_from_symbols;
 use crate::planner::sql_evaluator::sql_nodes::SqlNodesFactory;
-use crate::planner::{BaseMember, QueryProperties};
+use crate::planner::QueryProperties;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 
 pub struct SimpleQueryPlanner {
+    query_tools: Rc<QueryTools>,
     query_properties: Rc<QueryProperties>,
     join_planner: JoinPlanner,
     order_planner: OrderPlanner,
@@ -23,10 +25,21 @@ impl SimpleQueryPlanner {
             order_planner: OrderPlanner::new(query_properties.clone()),
             query_properties,
             context_factory,
+            query_tools,
         }
     }
 
-    pub fn plan(&self) -> Result<Select, CubeError> {
+    pub fn plan(&self) -> Result<Rc<Select>, CubeError> {
+        let subquery_dimensions = collect_sub_query_dimensions_from_symbols(
+            &self.query_properties.all_member_symbols(false),
+            self.query_tools.clone(),
+        )?;
+        let dimension_subquery_planner = DimensionSubqueryPlanner::try_new(
+            &subquery_dimensions,
+            self.query_tools.clone(),
+            self.query_properties.clone(),
+        )?;
+
         let filter = self.query_properties.all_filters();
         let having = if self.query_properties.measures_filters().is_empty() {
             None
@@ -36,15 +49,13 @@ impl SimpleQueryPlanner {
             })
         };
         let mut context_factory = self.context_factory.clone();
-        let from = self
-            .join_planner
-            .make_join_node_impl(&None, self.query_properties.simple_query_join()?)?;
+        let from = self.join_planner.make_join_node_impl(
+            &None,
+            self.query_properties.simple_query_join()?,
+            &dimension_subquery_planner,
+        )?;
         let mut select_builder = SelectBuilder::new(from.clone());
-        for time_dim in self.query_properties.time_dimensions() {
-            if let Some(granularity) = time_dim.get_granularity() {
-                context_factory.add_leaf_time_dimension(&time_dim.full_name(), &granularity);
-            }
-        }
+
         for member in self
             .query_properties
             .all_dimensions_and_measures(self.query_properties.measures())?
@@ -52,13 +63,15 @@ impl SimpleQueryPlanner {
         {
             select_builder.add_projection_member(member, None);
         }
+        let render_references = dimension_subquery_planner.dimensions_refs().clone();
+        context_factory.set_render_references(render_references);
         select_builder.set_filter(filter);
         select_builder.set_group_by(self.query_properties.group_by());
         select_builder.set_order_by(self.order_planner.default_order());
         select_builder.set_having(having);
         select_builder.set_limit(self.query_properties.row_limit());
         select_builder.set_offset(self.query_properties.offset());
-        let res = select_builder.build(context_factory);
+        let res = Rc::new(select_builder.build(context_factory));
         Ok(res)
     }
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/query_properties.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/query_properties.rs
index 2b7c2d2f06..cbc821b6f2 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/query_properties.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/query_properties.rs
@@ -1,8 +1,11 @@
 use super::filter::compiler::FilterCompiler;
 use super::query_tools::QueryTools;
+
+use super::sql_evaluator::MemberSymbol;
 use super::{BaseDimension, BaseMeasure, BaseMember, BaseMemberHelper, BaseTimeDimension};
 use crate::cube_bridge::base_query_options::BaseQueryOptions;
 use crate::cube_bridge::join_definition::JoinDefinition;
+use crate::cube_bridge::options_member::OptionsMember;
 use crate::plan::{Expr, Filter, FilterItem, MemberExpression};
 use crate::planner::sql_evaluator::collectors::{
     collect_multiplied_measures, has_cumulative_members, has_multi_stage_members,
@@ -37,6 +40,7 @@ pub struct FullKeyAggregateMeasures {
     pub multiplied_measures: Vec<Rc<BaseMeasure>>,
     pub regular_measures: Vec<Rc<BaseMeasure>>,
     pub multi_stage_measures: Vec<Rc<BaseMeasure>>,
+    pub rendered_as_multiplied_measures: HashSet<String>,
 }
 
 impl FullKeyAggregateMeasures {
@@ -74,12 +78,38 @@ impl QueryProperties {
         let evaluator_compiler_cell = query_tools.evaluator_compiler().clone();
         let mut evaluator_compiler = evaluator_compiler_cell.borrow_mut();
 
-        let dimensions = if let Some(dimensions) = &options.static_data().dimensions {
+        let dimensions = if let Some(dimensions) = &options.dimensions()? {
             dimensions
                 .iter()
-                .map(|d| {
-                    let evaluator = evaluator_compiler.add_dimension_evaluator(d.clone())?;
-                    BaseDimension::try_new_required(evaluator, query_tools.clone())
+                .map(|d| match d {
+                    OptionsMember::MemberName(member_name) => {
+                        let evaluator =
+                            evaluator_compiler.add_dimension_evaluator(member_name.clone())?;
+                        BaseDimension::try_new_required(evaluator, query_tools.clone())
+                    }
+                    OptionsMember::MemberExpression(member_expression) => {
+                        let cube_name =
+                            if let Some(name) = &member_expression.static_data().cube_name {
+                                name.clone()
+                            } else {
+                                "".to_string()
+                            };
+                        let name =
+                            if let Some(name) = &member_expression.static_data().expression_name {
+                                name.clone()
+                            } else {
+                                "".to_string()
+                            };
+                        let expression_evaluator = evaluator_compiler
+                            .compile_sql_call(&cube_name, member_expression.expression()?)?;
+                        BaseDimension::try_new_from_expression(
+                            expression_evaluator,
+                            cube_name,
+                            name,
+                            member_expression.static_data().definition.clone(),
+                            query_tools.clone(),
+                        )
+                    }
                 })
                 .collect::<Result<Vec<_>, _>>()?
         } else {
@@ -451,13 +481,28 @@ impl QueryProperties {
             let time_dimensions = self
                 .time_dimensions
                 .iter()
-                .map(|d| -> Rc<dyn BaseMember> { d.clone() });
+                .map(|d| -> Rc<dyn BaseMember> { d.base_dimension().clone() });
             dimensions
                 .chain(time_dimensions)
                 .chain(measures)
                 .collect_vec()
         }
     }
+    pub fn all_member_symbols(&self, exclude_time_dimensions: bool) -> Vec<Rc<MemberSymbol>> {
+        let mut members = BaseMemberHelper::extract_symbols_from_members(
+            &self.all_members(exclude_time_dimensions),
+        );
+        for filter_item in self.dimensions_filters.iter() {
+            filter_item.find_all_member_evaluators(&mut members);
+        }
+        for filter_item in self.measures_filters.iter() {
+            filter_item.find_all_member_evaluators(&mut members);
+        }
+        members
+            .into_iter()
+            .unique_by(|m| m.full_name())
+            .collect_vec()
+    }
 
     pub fn group_by(&self) -> Vec<Expr> {
         if self.ungrouped {
@@ -541,7 +586,7 @@ impl QueryProperties {
 
     pub fn full_key_aggregate_measures(&self) -> Result<FullKeyAggregateMeasures, CubeError> {
         let mut result = FullKeyAggregateMeasures::default();
-        let measures = self.measures();
+        let measures = self.all_used_measures()?;
         for m in measures.iter() {
             if has_multi_stage_members(m.member_evaluator(), self.ignore_cumulative)? {
                 result.multi_stage_measures.push(m.clone())
@@ -559,6 +604,11 @@ impl QueryProperties {
                     join,
                 )? {
                     if item.multiplied {
+                        result
+                            .rendered_as_multiplied_measures
+                            .insert(item.measure.full_name());
+                    }
+                    if item.multiplied && !item.measure.can_used_as_addictive_in_multplied()? {
                         result.multiplied_measures.push(item.measure.clone());
                     } else {
                         result.regular_measures.push(item.measure.clone());
@@ -569,4 +619,40 @@ impl QueryProperties {
 
         Ok(result)
     }
+
+    fn all_used_measures(&self) -> Result<Vec<Rc<BaseMeasure>>, CubeError> {
+        let mut measures = self.measures.clone();
+        for item in self.measures_filters.iter() {
+            self.fill_missed_measures_from_filter(item, &mut measures)?;
+        }
+        Ok(measures)
+    }
+
+    fn fill_missed_measures_from_filter(
+        &self,
+        item: &FilterItem,
+        measures: &mut Vec<Rc<BaseMeasure>>,
+    ) -> Result<(), CubeError> {
+        match item {
+            FilterItem::Group(group) => {
+                for item in group.items.iter() {
+                    self.fill_missed_measures_from_filter(item, measures)?
+                }
+            }
+            FilterItem::Item(item) => {
+                let item_member_name = item.member_name();
+                if measures
+                    .iter()
+                    .find(|m| m.full_name() == item_member_name)
+                    .is_none()
+                {
+                    measures.push(BaseMeasure::try_new_required(
+                        item.member_evaluator().clone(),
+                        self.query_tools.clone(),
+                    )?);
+                }
+            }
+        }
+        Ok(())
+    }
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/query_tools.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/query_tools.rs
index 5a1bfe3e4c..e75372e7c4 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/query_tools.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/query_tools.rs
@@ -4,6 +4,7 @@ use crate::cube_bridge::base_tools::BaseTools;
 use crate::cube_bridge::evaluator::CubeEvaluator;
 use crate::cube_bridge::join_definition::JoinDefinition;
 use crate::cube_bridge::join_graph::JoinGraph;
+use crate::cube_bridge::join_hints::JoinHintItem;
 use crate::cube_bridge::join_item::JoinItemStatic;
 use crate::cube_bridge::sql_templates_render::SqlTemplatesRender;
 use crate::plan::FilterItem;
@@ -20,8 +21,8 @@ use std::collections::HashMap;
 use std::rc::Rc;
 
 pub struct QueryToolsCachedData {
-    join_hints: HashMap<String, Rc<Vec<String>>>,
-    join_hints_to_join_key: HashMap<Vec<Rc<Vec<String>>>, Rc<JoinKey>>,
+    join_hints: HashMap<String, Rc<Vec<JoinHintItem>>>,
+    join_hints_to_join_key: HashMap<Vec<Rc<Vec<JoinHintItem>>>, Rc<JoinKey>>,
     join_key_to_join: HashMap<Rc<JoinKey>, Rc<dyn JoinDefinition>>,
 }
 
@@ -43,7 +44,7 @@ impl QueryToolsCachedData {
     pub fn join_hints_for_member(
         &mut self,
         node: &Rc<MemberSymbol>,
-    ) -> Result<Rc<Vec<String>>, CubeError> {
+    ) -> Result<Rc<Vec<JoinHintItem>>, CubeError> {
         let full_name = node.full_name();
         if let Some(val) = self.join_hints.get(&full_name) {
             Ok(val.clone())
@@ -57,7 +58,7 @@ impl QueryToolsCachedData {
     pub fn join_hints_for_base_member_vec<T: BaseMember>(
         &mut self,
         vec: &Vec<Rc<T>>,
-    ) -> Result<Vec<Rc<Vec<String>>>, CubeError> {
+    ) -> Result<Vec<Rc<Vec<JoinHintItem>>>, CubeError> {
         vec.iter()
             .map(|b| self.join_hints_for_member(&b.member_evaluator()))
             .collect::<Result<Vec<_>, _>>()
@@ -66,7 +67,7 @@ impl QueryToolsCachedData {
     pub fn join_hints_for_member_symbol_vec(
         &mut self,
         vec: &Vec<Rc<MemberSymbol>>,
-    ) -> Result<Vec<Rc<Vec<String>>>, CubeError> {
+    ) -> Result<Vec<Rc<Vec<JoinHintItem>>>, CubeError> {
         vec.iter()
             .map(|b| self.join_hints_for_member(b))
             .collect::<Result<Vec<_>, _>>()
@@ -75,7 +76,7 @@ impl QueryToolsCachedData {
     pub fn join_hints_for_filter_item_vec(
         &mut self,
         vec: &Vec<FilterItem>,
-    ) -> Result<Vec<Rc<Vec<String>>>, CubeError> {
+    ) -> Result<Vec<Rc<Vec<JoinHintItem>>>, CubeError> {
         let mut member_symbols = Vec::new();
         for i in vec.iter() {
             i.find_all_member_evaluators(&mut member_symbols);
@@ -88,8 +89,8 @@ impl QueryToolsCachedData {
 
     pub fn join_by_hints(
         &mut self,
-        hints: Vec<Rc<Vec<String>>>,
-        join_fn: impl FnOnce(Vec<String>) -> Result<Rc<dyn JoinDefinition>, CubeError>,
+        hints: Vec<Rc<Vec<JoinHintItem>>>,
+        join_fn: impl FnOnce(Vec<JoinHintItem>) -> Result<Rc<dyn JoinDefinition>, CubeError>,
     ) -> Result<(Rc<JoinKey>, Rc<dyn JoinDefinition>), CubeError> {
         if let Some(key) = self.join_hints_to_join_key.get(&hints) {
             Ok((key.clone(), self.join_key_to_join.get(key).unwrap().clone()))
@@ -104,7 +105,6 @@ impl QueryToolsCachedData {
                 root: join.static_data().root.to_string(),
                 joins: join
                     .joins()?
-                    .items()
                     .iter()
                     .map(|i| i.static_data().clone())
                     .collect(),
@@ -229,6 +229,16 @@ impl QueryTools {
         }
     }
 
+    pub fn alias_for_cube(&self, cube_name: &String) -> Result<String, CubeError> {
+        let cube_definition = self.cube_evaluator().cube_from_path(cube_name.clone())?;
+        let res = if let Some(sql_alias) = &cube_definition.static_data().sql_alias {
+            sql_alias.clone()
+        } else {
+            cube_name.clone()
+        };
+        Ok(res)
+    }
+
     pub fn escape_column_name(&self, column_name: &str) -> String {
         format!("\"{}\"", column_name)
     }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/cube_names_collector.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/cube_names_collector.rs
index 73f875a07a..9d7f68d7a6 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/cube_names_collector.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/cube_names_collector.rs
@@ -24,31 +24,48 @@ impl TraversalVisitor for CubeNamesCollector {
     fn on_node_traverse(
         &mut self,
         node: &Rc<MemberSymbol>,
+        path: &Vec<String>,
         _: &Self::State,
     ) -> Result<Option<Self::State>, CubeError> {
         match node.as_ref() {
             MemberSymbol::Dimension(e) => {
                 if e.owned_by_cube() {
-                    self.names.insert(e.cube_name().clone());
+                    if !path.is_empty() {
+                        for p in path {
+                            self.names.insert(p.clone());
+                        }
+                    } else {
+                        self.names.insert(e.cube_name().clone());
+                    }
                 }
-                for name in e.get_dependent_cubes().into_iter() {
-                    self.names.insert(name);
+                if e.is_sub_query() {
+                    return Ok(None);
                 }
             }
+            MemberSymbol::TimeDimension(e) => {
+                return self.on_node_traverse(e.base_symbol(), path, &())
+            }
             MemberSymbol::Measure(e) => {
                 if e.owned_by_cube() {
-                    self.names.insert(e.cube_name().clone());
-                }
-                for name in e.get_dependent_cubes().into_iter() {
-                    self.names.insert(name);
+                    if !path.is_empty() {
+                        for p in path {
+                            self.names.insert(p.clone());
+                        }
+                    } else {
+                        self.names.insert(e.cube_name().clone());
+                    }
                 }
             }
             MemberSymbol::CubeName(e) => {
+                if !path.is_empty() {
+                    for p in path {
+                        self.names.insert(p.clone());
+                    }
+                }
                 self.names.insert(e.cube_name().clone());
             }
-            MemberSymbol::CubeTable(e) => {
-                self.names.insert(e.cube_name().clone());
-            }
+            MemberSymbol::CubeTable(_) => {}
+            MemberSymbol::MemberExpression(_) => {}
         };
         Ok(Some(()))
     }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_cumulative_members.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_cumulative_members.rs
index deec7e9cbd..c73c578680 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_cumulative_members.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_cumulative_members.rs
@@ -23,6 +23,7 @@ impl TraversalVisitor for HasCumulativeMembersCollector {
     fn on_node_traverse(
         &mut self,
         node: &Rc<MemberSymbol>,
+        _path: &Vec<String>,
         _: &Self::State,
     ) -> Result<Option<Self::State>, CubeError> {
         match node.as_ref() {
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_multi_stage_members.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_multi_stage_members.rs
index 7190d39c46..170651bcaa 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_multi_stage_members.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_multi_stage_members.rs
@@ -25,6 +25,7 @@ impl TraversalVisitor for HasMultiStageMembersCollector {
     fn on_node_traverse(
         &mut self,
         node: &Rc<MemberSymbol>,
+        _path: &Vec<String>,
         _: &Self::State,
     ) -> Result<Option<Self::State>, CubeError> {
         match node.as_ref() {
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/join_hints_collector.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/join_hints_collector.rs
index b33ea186c6..086b610afd 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/join_hints_collector.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/join_hints_collector.rs
@@ -1,10 +1,12 @@
+use crate::cube_bridge::join_hints::JoinHintItem;
 use crate::planner::sql_evaluator::{MemberSymbol, TraversalVisitor};
 use crate::planner::BaseMeasure;
 use cubenativeutils::CubeError;
+use itertools::Itertools;
 use std::rc::Rc;
 
 pub struct JoinHintsCollector {
-    hints: Vec<String>,
+    hints: Vec<JoinHintItem>,
 }
 
 impl JoinHintsCollector {
@@ -12,8 +14,8 @@ impl JoinHintsCollector {
         Self { hints: Vec::new() }
     }
 
-    pub fn extract_result(self) -> Vec<String> {
-        self.hints
+    pub fn extract_result(self) -> Vec<JoinHintItem> {
+        self.hints.into_iter().unique().collect()
     }
 }
 
@@ -22,48 +24,72 @@ impl TraversalVisitor for JoinHintsCollector {
     fn on_node_traverse(
         &mut self,
         node: &Rc<MemberSymbol>,
+        path: &Vec<String>,
         _: &Self::State,
     ) -> Result<Option<Self::State>, CubeError> {
         match node.as_ref() {
             MemberSymbol::Dimension(e) => {
                 if e.owned_by_cube() {
-                    self.hints.push(e.cube_name().clone());
+                    if !path.is_empty() {
+                        if path.len() == 1 {
+                            self.hints.push(JoinHintItem::Single(path[0].clone()))
+                        } else {
+                            self.hints.push(JoinHintItem::Vector(path.clone()))
+                        }
+                    } else {
+                        self.hints.push(JoinHintItem::Single(e.cube_name().clone()));
+                    }
                 }
-                for name in e.get_dependent_cubes().into_iter() {
-                    self.hints.push(name);
+                if e.is_sub_query() {
+                    return Ok(None);
                 }
             }
+            MemberSymbol::TimeDimension(e) => {
+                return self.on_node_traverse(e.base_symbol(), path, &())
+            }
             MemberSymbol::Measure(e) => {
                 if e.owned_by_cube() {
-                    self.hints.push(e.cube_name().clone());
-                }
-                for name in e.get_dependent_cubes().into_iter() {
-                    self.hints.push(name);
+                    if !path.is_empty() {
+                        if path.len() == 1 {
+                            self.hints.push(JoinHintItem::Single(path[0].clone()))
+                        } else {
+                            self.hints.push(JoinHintItem::Vector(path.clone()))
+                        }
+                    } else {
+                        self.hints.push(JoinHintItem::Single(e.cube_name().clone()));
+                    }
                 }
             }
             MemberSymbol::CubeName(e) => {
-                self.hints.push(e.cube_name().clone());
-            }
-            MemberSymbol::CubeTable(e) => {
-                self.hints.push(e.cube_name().clone());
+                if !path.is_empty() {
+                    let mut path = path.clone();
+                    path.push(e.cube_name().clone());
+                    self.hints.push(JoinHintItem::Vector(path));
+                } else {
+                    self.hints.push(JoinHintItem::Single(e.cube_name().clone()));
+                }
             }
+            MemberSymbol::CubeTable(_) => {}
+            MemberSymbol::MemberExpression(_) => {}
         };
         Ok(Some(()))
     }
 }
 
-pub fn collect_join_hints(node: &Rc<MemberSymbol>) -> Result<Vec<String>, CubeError> {
+pub fn collect_join_hints(node: &Rc<MemberSymbol>) -> Result<Vec<JoinHintItem>, CubeError> {
     let mut visitor = JoinHintsCollector::new();
     visitor.apply(node, &())?;
-    Ok(visitor.extract_result())
+    let res = visitor.extract_result();
+    Ok(res)
 }
 
 pub fn collect_join_hints_for_measures(
     measures: &Vec<Rc<BaseMeasure>>,
-) -> Result<Vec<String>, CubeError> {
+) -> Result<Vec<JoinHintItem>, CubeError> {
     let mut visitor = JoinHintsCollector::new();
     for meas in measures.iter() {
         visitor.apply(&meas.member_evaluator(), &())?;
     }
-    Ok(visitor.extract_result())
+    let res = visitor.extract_result();
+    Ok(res)
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/member_childs_collector.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/member_childs_collector.rs
index 8bb049ee48..43f76b4133 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/member_childs_collector.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/member_childs_collector.rs
@@ -32,6 +32,7 @@ impl TraversalVisitor for MemberChildsCollector {
     fn on_node_traverse(
         &mut self,
         node: &Rc<MemberSymbol>,
+        _path: &Vec<String>,
         state: &Self::State,
     ) -> Result<Option<Self::State>, CubeError> {
         if state.is_root {
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/mod.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/mod.rs
index 1a3241bf74..3315b5dfa2 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/mod.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/mod.rs
@@ -4,6 +4,7 @@ mod has_multi_stage_members;
 mod join_hints_collector;
 mod member_childs_collector;
 mod multiplied_measures_collector;
+mod sub_query_dimensions;
 
 pub use cube_names_collector::collect_cube_names;
 pub use has_cumulative_members::{has_cumulative_members, HasCumulativeMembersCollector};
@@ -13,3 +14,7 @@ pub use join_hints_collector::{
 };
 pub use member_childs_collector::{member_childs, MemberChildsCollector};
 pub use multiplied_measures_collector::{collect_multiplied_measures, MultipliedMeasuresCollector};
+pub use sub_query_dimensions::{
+    collect_sub_query_dimensions, collect_sub_query_dimensions_from_members,
+    collect_sub_query_dimensions_from_symbols,
+};
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/multiplied_measures_collector.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/multiplied_measures_collector.rs
index 62de3b9914..b2e294cff5 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/multiplied_measures_collector.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/multiplied_measures_collector.rs
@@ -37,6 +37,7 @@ impl TraversalVisitor for CompositeMeasuresCollector {
     fn on_node_traverse(
         &mut self,
         node: &Rc<MemberSymbol>,
+        _path: &Vec<String>,
         state: &Self::State,
     ) -> Result<Option<Self::State>, CubeError> {
         let res = match node.as_ref() {
@@ -93,6 +94,7 @@ impl TraversalVisitor for MultipliedMeasuresCollector {
     fn on_node_traverse(
         &mut self,
         node: &Rc<MemberSymbol>,
+        _path: &Vec<String>,
         _: &Self::State,
     ) -> Result<Option<Self::State>, CubeError> {
         let res = match node.as_ref() {
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/sub_query_dimensions.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/sub_query_dimensions.rs
new file mode 100644
index 0000000000..e5e16d4cd5
--- /dev/null
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/sub_query_dimensions.rs
@@ -0,0 +1,90 @@
+use crate::planner::query_tools::QueryTools;
+use crate::planner::sql_evaluator::{DimensionSymbol, MemberSymbol, TraversalVisitor};
+use crate::planner::{BaseDimension, BaseMember};
+use cubenativeutils::CubeError;
+use itertools::Itertools;
+use std::rc::Rc;
+
+pub struct SubQueryDimensionsCollector {
+    pub sub_query_dimensions: Vec<Rc<MemberSymbol>>,
+}
+
+impl SubQueryDimensionsCollector {
+    pub fn new() -> Self {
+        Self {
+            sub_query_dimensions: vec![],
+        }
+    }
+
+    pub fn extract_result(self) -> Vec<Rc<MemberSymbol>> {
+        self.sub_query_dimensions
+    }
+
+    fn check_dim_has_measures(&self, dim: &DimensionSymbol) -> bool {
+        for dep in dim.get_dependencies().iter() {
+            match dep.as_ref() {
+                MemberSymbol::Measure(_) => return true,
+                _ => {}
+            }
+        }
+        return false;
+    }
+}
+
+impl TraversalVisitor for SubQueryDimensionsCollector {
+    type State = ();
+    fn on_node_traverse(
+        &mut self,
+        node: &Rc<MemberSymbol>,
+        path: &Vec<String>,
+        _state: &Self::State,
+    ) -> Result<Option<Self::State>, CubeError> {
+        match node.as_ref() {
+            MemberSymbol::Dimension(dim) => {
+                if dim.is_sub_query() {
+                    if !self.check_dim_has_measures(dim) {
+                        return Err(CubeError::user(format!(
+                            "Subquery dimension {} should reference at least one measure",
+                            dim.full_name()
+                        )));
+                    }
+                    self.sub_query_dimensions.push(node.clone());
+                }
+                Ok(Some(()))
+            }
+            MemberSymbol::TimeDimension(dim) => self.on_node_traverse(dim.base_symbol(), path, &()),
+            _ => Ok(Some(())),
+        }
+    }
+}
+
+pub fn collect_sub_query_dimensions_from_members(
+    members: &Vec<Rc<dyn BaseMember>>,
+    query_tools: Rc<QueryTools>,
+) -> Result<Vec<Rc<BaseDimension>>, CubeError> {
+    let symbols = members.iter().map(|m| m.member_evaluator()).collect_vec();
+    collect_sub_query_dimensions_from_symbols(&symbols, query_tools)
+}
+
+pub fn collect_sub_query_dimensions_from_symbols(
+    members: &Vec<Rc<MemberSymbol>>,
+    query_tools: Rc<QueryTools>,
+) -> Result<Vec<Rc<BaseDimension>>, CubeError> {
+    let mut visitor = SubQueryDimensionsCollector::new();
+    for member in members.iter() {
+        visitor.apply(&member, &())?;
+    }
+    visitor
+        .extract_result()
+        .into_iter()
+        .map(|s| BaseDimension::try_new_required(s, query_tools.clone()))
+        .collect::<Result<Vec<_>, CubeError>>()
+}
+
+pub fn collect_sub_query_dimensions(
+    node: &Rc<MemberSymbol>,
+) -> Result<Vec<Rc<MemberSymbol>>, CubeError> {
+    let mut visitor = SubQueryDimensionsCollector::new();
+    visitor.apply(node, &())?;
+    Ok(visitor.extract_result())
+}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/compiler.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/compiler.rs
index 9e87582b8c..fe20a91af7 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/compiler.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/compiler.rs
@@ -6,7 +6,8 @@ use super::{
     SqlCall, SymbolFactory, TraversalVisitor,
 };
 use crate::cube_bridge::evaluator::CubeEvaluator;
-use crate::cube_bridge::memeber_sql::MemberSql;
+use crate::cube_bridge::join_hints::JoinHintItem;
+use crate::cube_bridge::member_sql::MemberSql;
 use cubenativeutils::CubeError;
 use std::collections::HashMap;
 use std::rc::Rc;
@@ -80,7 +81,7 @@ impl Compiler {
         }
     }
 
-    pub fn join_hints(&self) -> Result<Vec<String>, CubeError> {
+    pub fn join_hints(&self) -> Result<Vec<JoinHintItem>, CubeError> {
         let mut collector = JoinHintsCollector::new();
         for member in self.members.values() {
             collector.apply(member, &())?;
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/dependecy.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/dependecy.rs
index ce284b2638..b1c69f5723 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/dependecy.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/dependecy.rs
@@ -1,7 +1,7 @@
 use super::symbols::MemberSymbol;
 use super::Compiler;
 use crate::cube_bridge::evaluator::{CallDep, CubeEvaluator};
-use crate::cube_bridge::memeber_sql::MemberSql;
+use crate::cube_bridge::member_sql::MemberSql;
 use cubenativeutils::CubeError;
 use std::collections::HashMap;
 use std::rc::Rc;
@@ -41,6 +41,7 @@ pub enum ContextSymbolDep {
     SecurityContext,
     FilterParams,
     FilterGroup,
+    SqlUtils,
 }
 
 #[derive(Clone)]
@@ -68,9 +69,12 @@ impl<'a> DependenciesBuilder<'a> {
         cube_name: String,
         member_sql: Rc<dyn MemberSql>,
     ) -> Result<Vec<Dependency>, CubeError> {
-        let call_deps = self
-            .cube_evaluator
-            .resolve_symbols_call_deps(cube_name.clone(), member_sql)?;
+        let call_deps = if member_sql.need_deps_resolve() {
+            self.cube_evaluator
+                .resolve_symbols_call_deps(cube_name.clone(), member_sql)?
+        } else {
+            vec![]
+        };
 
         let mut childs = Vec::new();
         for (i, dep) in call_deps.iter().enumerate() {
@@ -165,6 +169,7 @@ impl<'a> DependenciesBuilder<'a> {
                 ContextSymbolDep::FilterParams,
             )),
             "FILTER_GROUP" => Some(Dependency::ContextDependency(ContextSymbolDep::FilterGroup)),
+            "SQL_UTILS" => Some(Dependency::ContextDependency(ContextSymbolDep::SqlUtils)),
             _ => None,
         }
     }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/mod.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/mod.rs
index df22f8bc00..83cdce4b7d 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/mod.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/mod.rs
@@ -15,7 +15,7 @@ pub use sql_call::SqlCall;
 pub use sql_visitor::SqlEvaluatorVisitor;
 pub use symbols::{
     CubeNameSymbol, CubeNameSymbolFactory, CubeTableSymbol, CubeTableSymbolFactory,
-    DimensionSymbol, DimensionSymbolFactory, MeasureSymbol, MeasureSymbolFactory, MemberSymbol,
-    SymbolFactory,
+    DimensionSymbol, DimensionSymbolFactory, MeasureSymbol, MeasureSymbolFactory,
+    MemberExpressionSymbol, MemberSymbol, SymbolFactory, TimeDimensionSymbol,
 };
 pub use visitor::TraversalVisitor;
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_call.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_call.rs
index 35fed31484..63a9a906f4 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_call.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_call.rs
@@ -1,8 +1,9 @@
 use super::dependecy::{ContextSymbolDep, CubeDepProperty, CubeDependency, Dependency};
 use super::sql_nodes::SqlNode;
 use super::{symbols::MemberSymbol, SqlEvaluatorVisitor};
-use crate::cube_bridge::memeber_sql::{ContextSymbolArg, MemberSql, MemberSqlArg, MemberSqlStruct};
+use crate::cube_bridge::member_sql::{ContextSymbolArg, MemberSql, MemberSqlArg, MemberSqlStruct};
 use crate::planner::query_tools::QueryTools;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 
@@ -21,17 +22,36 @@ impl SqlCall {
         visitor: &SqlEvaluatorVisitor,
         node_processor: Rc<dyn SqlNode>,
         query_tools: Rc<QueryTools>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
         let args = self
             .deps
             .iter()
             .map(|d| {
-                self.evaluate_single_dep(&d, visitor, node_processor.clone(), query_tools.clone())
+                self.evaluate_single_dep(
+                    &d,
+                    visitor,
+                    node_processor.clone(),
+                    query_tools.clone(),
+                    templates,
+                )
             })
             .collect::<Result<Vec<_>, _>>()?;
         self.member_sql.call(args)
     }
 
+    pub fn get_dependencies(&self) -> Vec<Rc<MemberSymbol>> {
+        let mut deps = Vec::new();
+        self.extract_symbol_deps(&mut deps);
+        deps
+    }
+
+    pub fn get_dependencies_with_path(&self) -> Vec<(Rc<MemberSymbol>, Vec<String>)> {
+        let mut deps = Vec::new();
+        self.extract_symbol_deps_with_path(&mut deps);
+        deps
+    }
+
     pub fn extract_symbol_deps(&self, result: &mut Vec<Rc<MemberSymbol>>) {
         for dep in self.deps.iter() {
             match dep {
@@ -44,6 +64,24 @@ impl SqlCall {
         }
     }
 
+    pub fn extract_symbol_deps_with_path(&self, result: &mut Vec<(Rc<MemberSymbol>, Vec<String>)>) {
+        for dep in self.deps.iter() {
+            match dep {
+                Dependency::SymbolDependency(dep) => result.push((dep.clone(), vec![])),
+                Dependency::CubeDependency(cube_dep) => {
+                    self.extract_symbol_deps_with_path_from_cube_dep(cube_dep, vec![], result)
+                }
+                Dependency::ContextDependency(_) => {}
+            }
+        }
+    }
+
+    pub fn get_dependent_cubes(&self) -> Vec<String> {
+        let mut deps = Vec::new();
+        self.extract_cube_deps(&mut deps);
+        deps
+    }
+
     pub fn extract_cube_deps(&self, result: &mut Vec<String>) {
         for dep in self.deps.iter() {
             match dep {
@@ -71,6 +109,29 @@ impl SqlCall {
         }
     }
 
+    fn extract_symbol_deps_with_path_from_cube_dep(
+        &self,
+        cube_dep: &CubeDependency,
+        mut path: Vec<String>,
+        result: &mut Vec<(Rc<MemberSymbol>, Vec<String>)>,
+    ) {
+        path.push(cube_dep.cube_symbol.cube_name());
+        if let Some(sql_fn) = &cube_dep.sql_fn {
+            result.push((sql_fn.clone(), path.clone()));
+        }
+        if let Some(to_string_fn) = &cube_dep.to_string_fn {
+            result.push((to_string_fn.clone(), path.clone()));
+        }
+        for (_, v) in cube_dep.properties.iter() {
+            match v {
+                CubeDepProperty::SymbolDependency(dep) => result.push((dep.clone(), path.clone())),
+                CubeDepProperty::CubeDependency(cube_dep) => {
+                    self.extract_symbol_deps_with_path_from_cube_dep(cube_dep, path.clone(), result)
+                }
+            };
+        }
+    }
+
     fn extract_cube_deps_from_cube_dep(&self, cube_dep: &CubeDependency, result: &mut Vec<String>) {
         result.push(cube_dep.cube_symbol.name());
 
@@ -90,14 +151,21 @@ impl SqlCall {
         visitor: &SqlEvaluatorVisitor,
         node_processor: Rc<dyn SqlNode>,
         query_tools: Rc<QueryTools>,
+        templates: &PlanSqlTemplates,
     ) -> Result<MemberSqlArg, CubeError> {
         match dep {
-            Dependency::SymbolDependency(dep) => Ok(MemberSqlArg::String(
-                visitor.apply(dep, node_processor.clone())?,
-            )),
-            Dependency::CubeDependency(dep) => {
-                self.evaluate_cube_dep(dep, visitor, node_processor.clone(), query_tools.clone())
-            }
+            Dependency::SymbolDependency(dep) => Ok(MemberSqlArg::String(visitor.apply(
+                dep,
+                node_processor.clone(),
+                templates,
+            )?)),
+            Dependency::CubeDependency(dep) => self.evaluate_cube_dep(
+                dep,
+                visitor,
+                node_processor.clone(),
+                query_tools.clone(),
+                templates,
+            ),
             Dependency::ContextDependency(contex_symbol) => {
                 self.apply_context_symbol(contex_symbol, query_tools.clone())
             }
@@ -110,24 +178,27 @@ impl SqlCall {
         visitor: &SqlEvaluatorVisitor,
         node_processor: Rc<dyn SqlNode>,
         query_tools: Rc<QueryTools>,
+        templates: &PlanSqlTemplates,
     ) -> Result<MemberSqlArg, CubeError> {
         let mut res = MemberSqlStruct::default();
         if let Some(sql_fn) = &dep.sql_fn {
-            res.sql_fn = Some(visitor.apply(sql_fn, node_processor.clone())?);
+            res.sql_fn = Some(visitor.apply(sql_fn, node_processor.clone(), templates)?);
         }
         if let Some(to_string_fn) = &dep.to_string_fn {
-            res.to_string_fn = Some(visitor.apply(to_string_fn, node_processor.clone())?);
+            res.to_string_fn =
+                Some(visitor.apply(to_string_fn, node_processor.clone(), templates)?);
         }
         for (k, v) in dep.properties.iter() {
             let prop_res = match v {
                 CubeDepProperty::SymbolDependency(dep) => {
-                    MemberSqlArg::String(visitor.apply(&dep, node_processor.clone())?)
+                    MemberSqlArg::String(visitor.apply(&dep, node_processor.clone(), templates)?)
                 }
                 CubeDepProperty::CubeDependency(dep) => self.evaluate_cube_dep(
                     &dep,
                     visitor,
                     node_processor.clone(),
                     query_tools.clone(),
+                    templates,
                 )?,
             };
             res.properties.insert(k.clone(), prop_res);
@@ -152,6 +223,9 @@ impl SqlCall {
             ContextSymbolDep::FilterGroup => MemberSqlArg::ContextSymbol(
                 ContextSymbolArg::FilterGroup(query_tools.base_tools().filter_group_function()?),
             ),
+            ContextSymbolDep::SqlUtils => MemberSqlArg::ContextSymbol(ContextSymbolArg::SqlUtils(
+                query_tools.base_tools().sql_utils_for_rust()?,
+            )),
         };
         Ok(res)
     }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/auto_prefix.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/auto_prefix.rs
index 708242bb1b..20d0aab127 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/auto_prefix.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/auto_prefix.rs
@@ -3,6 +3,7 @@ use crate::plan::Schema;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::MemberSymbol;
 use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::any::Any;
 use std::collections::HashMap;
@@ -63,10 +64,15 @@ impl SqlNode for AutoPrefixSqlNode {
         node: &Rc<MemberSymbol>,
         query_tools: Rc<QueryTools>,
         node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
-        let input =
-            self.input
-                .to_sql(visitor, node, query_tools.clone(), node_processor.clone())?;
+        let input = self.input.to_sql(
+            visitor,
+            node,
+            query_tools.clone(),
+            node_processor.clone(),
+            templates,
+        )?;
         let res = match node.as_ref() {
             MemberSymbol::Dimension(ev) => {
                 let cube_alias = self.resolve_cube_alias(&ev.cube_name());
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/evaluate_sql.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/evaluate_sql.rs
index 63587cb928..6eeda7310d 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/evaluate_sql.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/evaluate_sql.rs
@@ -2,6 +2,7 @@ use super::SqlNode;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::MemberSymbol;
 use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::any::Any;
 use std::rc::Rc;
@@ -21,18 +22,77 @@ impl SqlNode for EvaluateSqlNode {
         node: &Rc<MemberSymbol>,
         query_tools: Rc<QueryTools>,
         node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
         match node.as_ref() {
-            MemberSymbol::Dimension(ev) => {
-                ev.evaluate_sql(visitor, node_processor.clone(), query_tools.clone())
+            MemberSymbol::Dimension(ev) => ev.evaluate_sql(
+                visitor,
+                node_processor.clone(),
+                query_tools.clone(),
+                templates,
+            ),
+            MemberSymbol::TimeDimension(ev) => {
+                let input_sql =
+                    visitor.apply(&ev.base_symbol(), node_processor.clone(), templates)?;
+                let res = if let Some(granularity) = ev.granularity() {
+                    let converted_tz = query_tools.base_tools().convert_tz(input_sql)?;
+                    query_tools
+                        .base_tools()
+                        .time_grouped_column(granularity.clone(), converted_tz)?
+                } else {
+                    input_sql
+                };
+                Ok(res)
             }
             MemberSymbol::Measure(ev) => {
-                ev.evaluate_sql(visitor, node_processor.clone(), query_tools.clone())
-            }
-            MemberSymbol::CubeTable(ev) => {
-                ev.evaluate_sql(visitor, node_processor.clone(), query_tools.clone())
+                let res = if ev.has_sql() {
+                    ev.evaluate_sql(
+                        visitor,
+                        node_processor.clone(),
+                        query_tools.clone(),
+                        templates,
+                    )?
+                } else if ev.pk_sqls().len() > 1 {
+                    let pk_strings = ev
+                        .pk_sqls()
+                        .iter()
+                        .map(|pk| -> Result<_, CubeError> {
+                            let res = pk.eval(
+                                &visitor,
+                                node_processor.clone(),
+                                query_tools.clone(),
+                                templates,
+                            )?;
+                            templates.cast_to_string(&res)
+                        })
+                        .collect::<Result<Vec<_>, _>>()?;
+                    templates.concat_strings(&pk_strings)?
+                } else if ev.pk_sqls().len() == 1 {
+                    let pk_sql = ev.pk_sqls().first().unwrap();
+                    pk_sql.eval(
+                        &visitor,
+                        node_processor.clone(),
+                        query_tools.clone(),
+                        templates,
+                    )?
+                } else {
+                    format!("*")
+                };
+                Ok(res)
             }
+            MemberSymbol::CubeTable(ev) => ev.evaluate_sql(
+                visitor,
+                node_processor.clone(),
+                query_tools.clone(),
+                templates,
+            ),
             MemberSymbol::CubeName(ev) => ev.evaluate_sql(),
+            MemberSymbol::MemberExpression(e) => e.evaluate_sql(
+                visitor,
+                node_processor.clone(),
+                query_tools.clone(),
+                templates,
+            ),
         }
     }
 
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/factory.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/factory.rs
index a288558b29..0c3d4b727f 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/factory.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/factory.rs
@@ -1,12 +1,11 @@
-use super::leaf_time_dimension::LeafTimeDimensionNode;
 use super::{
-    AutoPrefixSqlNode, EvaluateSqlNode, FinalMeasureSqlNode, MeasureFilterSqlNode,
-    MultiStageRankNode, MultiStageWindowNode, RenderReferencesSqlNode, RollingWindowNode,
-    RootSqlNode, SqlNode, TimeShiftSqlNode, UngroupedMeasureSqlNode,
+    AutoPrefixSqlNode, EvaluateSqlNode, FinalMeasureSqlNode, GeoDimensionSqlNode,
+    MeasureFilterSqlNode, MultiStageRankNode, MultiStageWindowNode, RenderReferencesSqlNode,
+    RollingWindowNode, RootSqlNode, SqlNode, TimeShiftSqlNode, UngroupedMeasureSqlNode,
     UngroupedQueryFinalMeasureSqlNode,
 };
 use crate::plan::schema::QualifiedColumnName;
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::rc::Rc;
 
 #[derive(Clone)]
@@ -14,9 +13,10 @@ pub struct SqlNodesFactory {
     time_shifts: HashMap<String, String>,
     ungrouped: bool,
     ungrouped_measure: bool,
+    count_approx_as_state: bool,
     render_references: HashMap<String, QualifiedColumnName>,
+    rendered_as_multiplied_measures: HashSet<String>,
     ungrouped_measure_references: HashMap<String, QualifiedColumnName>,
-    leaf_time_dimensions: HashMap<String, String>,
     cube_name_references: HashMap<String, String>,
     multi_stage_rank: Option<Vec<String>>,   //partition_by
     multi_stage_window: Option<Vec<String>>, //partition_by
@@ -29,10 +29,11 @@ impl SqlNodesFactory {
             time_shifts: HashMap::new(),
             ungrouped: false,
             ungrouped_measure: false,
+            count_approx_as_state: false,
             render_references: HashMap::new(),
             ungrouped_measure_references: HashMap::new(),
             cube_name_references: HashMap::new(),
-            leaf_time_dimensions: HashMap::new(),
+            rendered_as_multiplied_measures: HashSet::new(),
             multi_stage_rank: None,
             multi_stage_window: None,
             rolling_window: false,
@@ -59,6 +60,10 @@ impl SqlNodesFactory {
         &self.render_references
     }
 
+    pub fn set_rendered_as_multiplied_measures(&mut self, value: HashSet<String>) {
+        self.rendered_as_multiplied_measures = value;
+    }
+
     pub fn add_render_reference(&mut self, key: String, value: QualifiedColumnName) {
         self.render_references.insert(key, value);
     }
@@ -67,11 +72,6 @@ impl SqlNodesFactory {
         self.multi_stage_rank = Some(partition_by);
     }
 
-    pub fn add_leaf_time_dimension(&mut self, dimension_name: &String, granularity: &String) {
-        self.leaf_time_dimensions
-            .insert(dimension_name.clone(), granularity.clone());
-    }
-
     pub fn set_multi_stage_window(&mut self, partition_by: Vec<String>) {
         self.multi_stage_window = Some(partition_by);
     }
@@ -80,6 +80,10 @@ impl SqlNodesFactory {
         self.rolling_window = value;
     }
 
+    pub fn set_count_approx_as_state(&mut self, value: bool) {
+        self.count_approx_as_state = value;
+    }
+
     pub fn set_ungrouped_measure_references(
         &mut self,
         value: HashMap<String, QualifiedColumnName>,
@@ -116,7 +120,7 @@ impl SqlNodesFactory {
         let measure_processor = self.add_multi_stage_rank_if_needed(measure_processor);
 
         let root_node = RootSqlNode::new(
-            self.dimension_processor(auto_prefix_processor.clone()),
+            self.dimension_processor(evaluate_sql_processor.clone()),
             measure_processor.clone(),
             auto_prefix_processor.clone(),
             evaluate_sql_processor.clone(),
@@ -163,22 +167,26 @@ impl SqlNodesFactory {
         } else if self.rolling_window {
             RollingWindowNode::new(input)
         } else {
-            FinalMeasureSqlNode::new(input)
+            FinalMeasureSqlNode::new(
+                input,
+                self.rendered_as_multiplied_measures.clone(),
+                self.count_approx_as_state,
+            )
         }
     }
 
     fn dimension_processor(&self, input: Rc<dyn SqlNode>) -> Rc<dyn SqlNode> {
+        let input: Rc<dyn SqlNode> = GeoDimensionSqlNode::new(input);
+
+        let input: Rc<dyn SqlNode> =
+            AutoPrefixSqlNode::new(input, self.cube_name_references.clone());
+
         let input = if !&self.time_shifts.is_empty() {
             TimeShiftSqlNode::new(self.time_shifts.clone(), input)
         } else {
             input
         };
 
-        let input = if !&self.leaf_time_dimensions.is_empty() {
-            LeafTimeDimensionNode::new(input, self.leaf_time_dimensions.clone())
-        } else {
-            input
-        };
         input
     }
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/final_measure.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/final_measure.rs
index c844c2a786..2f3644afc4 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/final_measure.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/final_measure.rs
@@ -1,23 +1,44 @@
 use super::SqlNode;
 use crate::planner::query_tools::QueryTools;
+use crate::planner::sql_evaluator::MeasureSymbol;
 use crate::planner::sql_evaluator::MemberSymbol;
 use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::any::Any;
+use std::collections::HashSet;
 use std::rc::Rc;
 
 pub struct FinalMeasureSqlNode {
     input: Rc<dyn SqlNode>,
+    rendered_as_multiplied_measures: HashSet<String>,
+    count_approx_as_state: bool,
 }
 
 impl FinalMeasureSqlNode {
-    pub fn new(input: Rc<dyn SqlNode>) -> Rc<Self> {
-        Rc::new(Self { input })
+    pub fn new(
+        input: Rc<dyn SqlNode>,
+        rendered_as_multiplied_measures: HashSet<String>,
+        count_approx_as_state: bool,
+    ) -> Rc<Self> {
+        Rc::new(Self {
+            input,
+            rendered_as_multiplied_measures,
+            count_approx_as_state,
+        })
     }
 
     pub fn input(&self) -> &Rc<dyn SqlNode> {
         &self.input
     }
+
+    fn is_count_disttinct(&self, symbol: &MeasureSymbol) -> bool {
+        symbol.measure_type() == "countDistinct"
+            || (symbol.measure_type() == "count"
+                && self
+                    .rendered_as_multiplied_measures
+                    .contains(&symbol.full_name()))
+    }
 }
 
 impl SqlNode for FinalMeasureSqlNode {
@@ -27,6 +48,7 @@ impl SqlNode for FinalMeasureSqlNode {
         node: &Rc<MemberSymbol>,
         query_tools: Rc<QueryTools>,
         node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
         let res = match node.as_ref() {
             MemberSymbol::Measure(ev) => {
@@ -35,11 +57,20 @@ impl SqlNode for FinalMeasureSqlNode {
                     node,
                     query_tools.clone(),
                     node_processor.clone(),
+                    templates,
                 )?;
                 //};
 
                 if ev.is_calculated() {
                     input
+                } else if ev.measure_type() == "countDistinctApprox" {
+                    if self.count_approx_as_state {
+                        query_tools.base_tools().hll_init(input)?
+                    } else {
+                        query_tools.base_tools().count_distinct_approx(input)?
+                    }
+                } else if self.is_count_disttinct(ev) {
+                    templates.count_distinct(&input)?
                 } else {
                     let measure_type = if ev.measure_type() == "runningTotal" {
                         "sum"
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/geo_dimension.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/geo_dimension.rs
new file mode 100644
index 0000000000..d6691f59d3
--- /dev/null
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/geo_dimension.rs
@@ -0,0 +1,86 @@
+use super::SqlNode;
+use crate::planner::query_tools::QueryTools;
+use crate::planner::sql_evaluator::MemberSymbol;
+use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
+use crate::planner::sql_templates::PlanSqlTemplates;
+use cubenativeutils::CubeError;
+use std::any::Any;
+use std::rc::Rc;
+
+pub struct GeoDimensionSqlNode {
+    input: Rc<dyn SqlNode>,
+}
+
+impl GeoDimensionSqlNode {
+    pub fn new(input: Rc<dyn SqlNode>) -> Rc<Self> {
+        Rc::new(Self { input })
+    }
+
+    pub fn input(&self) -> &Rc<dyn SqlNode> {
+        &self.input
+    }
+}
+
+impl SqlNode for GeoDimensionSqlNode {
+    fn to_sql(
+        &self,
+        visitor: &SqlEvaluatorVisitor,
+        node: &Rc<MemberSymbol>,
+        query_tools: Rc<QueryTools>,
+        node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
+    ) -> Result<String, CubeError> {
+        let res = match node.as_ref() {
+            MemberSymbol::Dimension(ev) => {
+                if ev.dimension_type() == "geo" {
+                    if let (Some(latitude), Some(longitude)) = (ev.latitude(), ev.longitude()) {
+                        let latitude_str = latitude.eval(
+                            visitor,
+                            node_processor.clone(),
+                            query_tools.clone(),
+                            templates,
+                        )?;
+                        let longitude_str = longitude.eval(
+                            visitor,
+                            node_processor.clone(),
+                            query_tools.clone(),
+                            templates,
+                        )?;
+                        templates.concat_strings(&vec![
+                            latitude_str,
+                            format!("','"),
+                            longitude_str,
+                        ])?
+                    } else {
+                        return Err(CubeError::user(format!(
+                            "Geo dimension '{}' must have latitude and longitude",
+                            ev.full_name()
+                        )));
+                    }
+                } else {
+                    self.input.to_sql(
+                        visitor,
+                        node,
+                        query_tools.clone(),
+                        node_processor.clone(),
+                        templates,
+                    )?
+                }
+            }
+            _ => {
+                return Err(CubeError::internal(format!(
+                    "GeoDimension node processor called for wrong node",
+                )));
+            }
+        };
+        Ok(res)
+    }
+
+    fn as_any(self: Rc<Self>) -> Rc<dyn Any> {
+        self.clone()
+    }
+
+    fn childs(&self) -> Vec<Rc<dyn SqlNode>> {
+        vec![self.input.clone()]
+    }
+}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/leaf_time_dimension.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/leaf_time_dimension.rs
deleted file mode 100644
index 92c06ec1e6..0000000000
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/leaf_time_dimension.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use super::SqlNode;
-use crate::planner::query_tools::QueryTools;
-use crate::planner::sql_evaluator::MemberSymbol;
-use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
-use cubenativeutils::CubeError;
-use std::any::Any;
-use std::collections::HashMap;
-use std::rc::Rc;
-
-pub struct LeafTimeDimensionNode {
-    input: Rc<dyn SqlNode>,
-    leaf_time_dimensions: HashMap<String, String>,
-}
-
-impl LeafTimeDimensionNode {
-    pub fn new(input: Rc<dyn SqlNode>, leaf_time_dimensions: HashMap<String, String>) -> Rc<Self> {
-        Rc::new(Self {
-            input,
-            leaf_time_dimensions,
-        })
-    }
-}
-
-impl SqlNode for LeafTimeDimensionNode {
-    fn to_sql(
-        &self,
-        visitor: &SqlEvaluatorVisitor,
-        node: &Rc<MemberSymbol>,
-        query_tools: Rc<QueryTools>,
-        node_processor: Rc<dyn SqlNode>,
-    ) -> Result<String, CubeError> {
-        let full_name = node.full_name();
-        let input_sql = self
-            .input
-            .to_sql(visitor, node, query_tools.clone(), node_processor)?;
-
-        let res = if let Some(granularity) = self.leaf_time_dimensions.get(&full_name) {
-            let converted_tz = query_tools.base_tools().convert_tz(input_sql)?;
-            query_tools
-                .base_tools()
-                .time_grouped_column(granularity.clone(), converted_tz)?
-        } else {
-            input_sql
-        };
-        Ok(res)
-    }
-
-    fn as_any(self: Rc<Self>) -> Rc<dyn Any> {
-        self.clone()
-    }
-
-    fn childs(&self) -> Vec<Rc<dyn SqlNode>> {
-        vec![self.input.clone()]
-    }
-}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/measure_filter.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/measure_filter.rs
index e9f7c771c7..e180959925 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/measure_filter.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/measure_filter.rs
@@ -2,6 +2,7 @@ use super::SqlNode;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::MemberSymbol;
 use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::any::Any;
 use std::rc::Rc;
@@ -27,10 +28,15 @@ impl SqlNode for MeasureFilterSqlNode {
         node: &Rc<MemberSymbol>,
         query_tools: Rc<QueryTools>,
         node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
-        let input =
-            self.input
-                .to_sql(visitor, node, query_tools.clone(), node_processor.clone())?;
+        let input = self.input.to_sql(
+            visitor,
+            node,
+            query_tools.clone(),
+            node_processor.clone(),
+            templates,
+        )?;
         let res = match node.as_ref() {
             MemberSymbol::Measure(ev) => {
                 let measure_filters = ev.measure_filters();
@@ -43,7 +49,8 @@ impl SqlNode for MeasureFilterSqlNode {
                                 filter.eval(
                                     &visitor,
                                     node_processor.clone(),
-                                    query_tools.clone()
+                                    query_tools.clone(),
+                                    templates
                                 )?
                             ))
                         })
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/mod.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/mod.rs
index 346fb326cc..8b1e16cdf4 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/mod.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/mod.rs
@@ -2,7 +2,7 @@ pub mod auto_prefix;
 pub mod evaluate_sql;
 pub mod factory;
 pub mod final_measure;
-pub mod leaf_time_dimension;
+pub mod geo_dimension;
 pub mod measure_filter;
 pub mod multi_stage_rank;
 pub mod multi_stage_window;
@@ -18,6 +18,7 @@ pub use auto_prefix::AutoPrefixSqlNode;
 pub use evaluate_sql::EvaluateSqlNode;
 pub use factory::SqlNodesFactory;
 pub use final_measure::FinalMeasureSqlNode;
+pub use geo_dimension::GeoDimensionSqlNode;
 pub use measure_filter::MeasureFilterSqlNode;
 pub use multi_stage_rank::MultiStageRankNode;
 pub use multi_stage_window::MultiStageWindowNode;
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/multi_stage_rank.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/multi_stage_rank.rs
index 493de8228d..d1200b8fae 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/multi_stage_rank.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/multi_stage_rank.rs
@@ -2,6 +2,7 @@ use super::SqlNode;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::MemberSymbol;
 use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::any::Any;
 use std::rc::Rc;
@@ -35,6 +36,7 @@ impl SqlNode for MultiStageRankNode {
         node: &Rc<MemberSymbol>,
         query_tools: Rc<QueryTools>,
         node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
         let res = match node.as_ref() {
             MemberSymbol::Measure(m) => {
@@ -48,6 +50,7 @@ impl SqlNode for MultiStageRankNode {
                                     visitor,
                                     node_processor.clone(),
                                     query_tools.clone(),
+                                    templates,
                                 )?;
                                 Ok(format!("{} {}", sql, item.direction()))
                             })
@@ -69,6 +72,7 @@ impl SqlNode for MultiStageRankNode {
                         node,
                         query_tools.clone(),
                         node_processor.clone(),
+                        templates,
                     )?
                 }
             }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/multi_stage_window.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/multi_stage_window.rs
index 4d1fc74c6b..fe41626d66 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/multi_stage_window.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/multi_stage_window.rs
@@ -1,6 +1,7 @@
 use super::SqlNode;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::{MemberSymbol, SqlEvaluatorVisitor};
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::any::Any;
 use std::rc::Rc;
@@ -44,6 +45,7 @@ impl SqlNode for MultiStageWindowNode {
         node: &Rc<MemberSymbol>,
         query_tools: Rc<QueryTools>,
         node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
         let res = match node.as_ref() {
             MemberSymbol::Measure(m) => {
@@ -53,6 +55,7 @@ impl SqlNode for MultiStageWindowNode {
                         node,
                         query_tools.clone(),
                         node_processor.clone(),
+                        templates,
                     )?;
 
                     let partition_by = if self.partition.is_empty() {
@@ -68,6 +71,7 @@ impl SqlNode for MultiStageWindowNode {
                         node,
                         query_tools.clone(),
                         node_processor.clone(),
+                        templates,
                     )?
                 }
             }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/render_references.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/render_references.rs
index 9d4e17a868..0b3b693453 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/render_references.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/render_references.rs
@@ -3,6 +3,7 @@ use crate::plan::QualifiedColumnName;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::MemberSymbol;
 use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::any::Any;
 use std::collections::HashMap;
@@ -33,6 +34,7 @@ impl SqlNode for RenderReferencesSqlNode {
         node: &Rc<MemberSymbol>,
         query_tools: Rc<QueryTools>,
         node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
         let full_name = node.full_name();
         if let Some(reference) = self.references.get(&full_name) {
@@ -46,8 +48,13 @@ impl SqlNode for RenderReferencesSqlNode {
                 query_tools.escape_column_name(&reference.name())
             ))
         } else {
-            self.input
-                .to_sql(visitor, node, query_tools.clone(), node_processor.clone())
+            self.input.to_sql(
+                visitor,
+                node,
+                query_tools.clone(),
+                node_processor.clone(),
+                templates,
+            )
         }
     }
 
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/rolling_window.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/rolling_window.rs
index b6bcc87431..18e14c93dc 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/rolling_window.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/rolling_window.rs
@@ -1,6 +1,7 @@
 use super::SqlNode;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::{MemberSymbol, SqlEvaluatorVisitor};
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::any::Any;
 use std::rc::Rc;
@@ -26,23 +27,32 @@ impl SqlNode for RollingWindowNode {
         node: &Rc<MemberSymbol>,
         query_tools: Rc<QueryTools>,
         node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
         let res = match node.as_ref() {
             MemberSymbol::Measure(m) => {
-                let input =
-                    self.input
-                        .to_sql(visitor, node, query_tools.clone(), node_processor)?;
+                let input = self.input.to_sql(
+                    visitor,
+                    node,
+                    query_tools.clone(),
+                    node_processor,
+                    templates,
+                )?;
                 if m.is_cumulative() {
-                    let aggregate_function = if m.measure_type() == "sum"
-                        || m.measure_type() == "count"
-                        || m.measure_type() == "runningTotal"
-                    {
-                        "sum"
+                    if m.measure_type() == "countDistinctApprox" {
+                        query_tools.base_tools().hll_cardinality_merge(input)?
                     } else {
-                        m.measure_type()
-                    };
+                        let aggregate_function = if m.measure_type() == "sum"
+                            || m.measure_type() == "count"
+                            || m.measure_type() == "runningTotal"
+                        {
+                            "sum"
+                        } else {
+                            m.measure_type()
+                        };
 
-                    format!("{}({})", aggregate_function, input)
+                        format!("{}({})", aggregate_function, input)
+                    }
                 } else {
                     input
                 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/root_processor.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/root_processor.rs
index 1669668786..5aae2dbb2b 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/root_processor.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/root_processor.rs
@@ -2,6 +2,7 @@ use super::SqlNode;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::MemberSymbol;
 use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::any::Any;
 use std::rc::Rc;
@@ -52,6 +53,7 @@ impl SqlNode for RootSqlNode {
         node: &Rc<MemberSymbol>,
         query_tools: Rc<QueryTools>,
         node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
         let res = match node.as_ref() {
             MemberSymbol::Dimension(_) => self.dimension_processor.to_sql(
@@ -59,24 +61,28 @@ impl SqlNode for RootSqlNode {
                 node,
                 query_tools.clone(),
                 node_processor.clone(),
+                templates,
             )?,
             MemberSymbol::Measure(_) => self.measure_processor.to_sql(
                 visitor,
                 node,
                 query_tools.clone(),
                 node_processor.clone(),
+                templates,
             )?,
             MemberSymbol::CubeName(_) => self.cube_name_processor.to_sql(
                 visitor,
                 node,
                 query_tools.clone(),
                 node_processor.clone(),
+                templates,
             )?,
             _ => self.default_processor.to_sql(
                 visitor,
                 node,
                 query_tools.clone(),
                 node_processor.clone(),
+                templates,
             )?,
         };
         Ok(res)
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/sql_node.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/sql_node.rs
index 1755c36e28..f5c2213caa 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/sql_node.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/sql_node.rs
@@ -1,5 +1,7 @@
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::{MemberSymbol, SqlEvaluatorVisitor};
+use crate::planner::sql_templates::PlanSqlTemplates;
+
 use cubenativeutils::CubeError;
 use std::any::Any;
 use std::rc::Rc;
@@ -11,6 +13,7 @@ pub trait SqlNode {
         node: &Rc<MemberSymbol>,
         query_tools: Rc<QueryTools>,
         node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError>;
 
     fn as_any(self: Rc<Self>) -> Rc<dyn Any>;
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/time_shift.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/time_shift.rs
index f3b30dd7f1..e0777823fe 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/time_shift.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/time_shift.rs
@@ -2,6 +2,7 @@ use super::SqlNode;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::MemberSymbol;
 use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::any::Any;
 use std::collections::HashMap;
@@ -33,10 +34,15 @@ impl SqlNode for TimeShiftSqlNode {
         node: &Rc<MemberSymbol>,
         query_tools: Rc<QueryTools>,
         node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
-        let input =
-            self.input
-                .to_sql(visitor, node, query_tools.clone(), node_processor.clone())?;
+        let input = self.input.to_sql(
+            visitor,
+            node,
+            query_tools.clone(),
+            node_processor.clone(),
+            templates,
+        )?;
         let res = match node.as_ref() {
             MemberSymbol::Dimension(ev) => {
                 if let Some(shift) = self.shifts.get(&ev.full_name()) {
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/ungroupped_measure.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/ungroupped_measure.rs
index 1b2f9675a7..0cad6b0ce0 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/ungroupped_measure.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/ungroupped_measure.rs
@@ -2,6 +2,7 @@ use super::SqlNode;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::MemberSymbol;
 use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::any::Any;
 use std::rc::Rc;
@@ -27,6 +28,7 @@ impl SqlNode for UngroupedMeasureSqlNode {
         node: &Rc<MemberSymbol>,
         query_tools: Rc<QueryTools>,
         node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
         let res = match node.as_ref() {
             MemberSymbol::Measure(_) => {
@@ -35,6 +37,7 @@ impl SqlNode for UngroupedMeasureSqlNode {
                     node,
                     query_tools.clone(),
                     node_processor.clone(),
+                    templates,
                 )?;
 
                 if input == "*" {
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/ungroupped_query_final_measure.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/ungroupped_query_final_measure.rs
index c77afa191b..305e58a881 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/ungroupped_query_final_measure.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/ungroupped_query_final_measure.rs
@@ -2,6 +2,7 @@ use super::SqlNode;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::MemberSymbol;
 use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::any::Any;
 use std::rc::Rc;
@@ -27,6 +28,7 @@ impl SqlNode for UngroupedQueryFinalMeasureSqlNode {
         node: &Rc<MemberSymbol>,
         query_tools: Rc<QueryTools>,
         node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
         let res = match node.as_ref() {
             MemberSymbol::Measure(ev) => {
@@ -35,6 +37,7 @@ impl SqlNode for UngroupedQueryFinalMeasureSqlNode {
                     node,
                     query_tools.clone(),
                     node_processor.clone(),
+                    templates,
                 )?;
 
                 if input == "*" {
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_visitor.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_visitor.rs
index 6a583bd86a..2d9087c91c 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_visitor.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_visitor.rs
@@ -1,6 +1,7 @@
 use super::sql_nodes::SqlNode;
 use super::MemberSymbol;
 use crate::planner::query_tools::QueryTools;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 
@@ -18,9 +19,15 @@ impl SqlEvaluatorVisitor {
         &self,
         node: &Rc<MemberSymbol>,
         node_processor: Rc<dyn SqlNode>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
-        let result =
-            node_processor.to_sql(self, node, self.query_tools.clone(), node_processor.clone())?;
+        let result = node_processor.to_sql(
+            self,
+            node,
+            self.query_tools.clone(),
+            node_processor.clone(),
+            templates,
+        )?;
         Ok(result)
     }
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/cube_symbol.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/cube_symbol.rs
index 263d28e88c..bfa3be5cfc 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/cube_symbol.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/cube_symbol.rs
@@ -1,9 +1,10 @@
 use super::{MemberSymbol, SymbolFactory};
 use crate::cube_bridge::cube_definition::CubeDefinition;
 use crate::cube_bridge::evaluator::CubeEvaluator;
-use crate::cube_bridge::memeber_sql::MemberSql;
+use crate::cube_bridge::member_sql::MemberSql;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::{sql_nodes::SqlNode, Compiler, SqlCall, SqlEvaluatorVisitor};
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use lazy_static::lazy_static;
 use regex::Regex;
@@ -67,7 +68,7 @@ impl SymbolFactory for CubeNameSymbolFactory {
 
 pub struct CubeTableSymbol {
     cube_name: String,
-    member_sql: Rc<SqlCall>,
+    member_sql: Option<Rc<SqlCall>>,
     #[allow(dead_code)]
     definition: Rc<dyn CubeDefinition>,
     is_table_sql: bool,
@@ -76,7 +77,7 @@ pub struct CubeTableSymbol {
 impl CubeTableSymbol {
     pub fn new(
         cube_name: String,
-        member_sql: Rc<SqlCall>,
+        member_sql: Option<Rc<SqlCall>>,
         definition: Rc<dyn CubeDefinition>,
         is_table_sql: bool,
     ) -> Self {
@@ -93,26 +94,35 @@ impl CubeTableSymbol {
         visitor: &SqlEvaluatorVisitor,
         node_processor: Rc<dyn SqlNode>,
         query_tools: Rc<QueryTools>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
-        lazy_static! {
-            static ref SIMPLE_ASTERIX_RE: Regex =
-                Regex::new(r#"(?i)^\s*select\s+\*\s+from\s+([a-zA-Z0-9_\-`".*]+)\s*$"#).unwrap();
-        }
-        let sql = self.member_sql.eval(visitor, node_processor, query_tools)?;
-        let res = if self.is_table_sql {
-            sql
-        } else {
-            if let Some(captures) = SIMPLE_ASTERIX_RE.captures(&sql) {
-                if let Some(table) = captures.get(1) {
-                    table.as_str().to_owned()
+        if let Some(member_sql) = &self.member_sql {
+            lazy_static! {
+                static ref SIMPLE_ASTERIX_RE: Regex =
+                    Regex::new(r#"(?i)^\s*select\s+\*\s+from\s+([a-zA-Z0-9_\-`".*]+)\s*$"#)
+                        .unwrap();
+            }
+            let sql = member_sql.eval(visitor, node_processor, query_tools, templates)?;
+            let res = if self.is_table_sql {
+                sql
+            } else {
+                if let Some(captures) = SIMPLE_ASTERIX_RE.captures(&sql) {
+                    if let Some(table) = captures.get(1) {
+                        table.as_str().to_owned()
+                    } else {
+                        format!("({})", sql)
+                    }
                 } else {
                     format!("({})", sql)
                 }
-            } else {
-                format!("({})", sql)
-            }
-        };
-        Ok(res)
+            };
+            Ok(res)
+        } else {
+            Err(CubeError::internal(format!(
+                "Cube {} doesn't have sql evaluator",
+                self.cube_name
+            )))
+        }
     }
     pub fn cube_name(&self) -> &String {
         &self.cube_name
@@ -121,7 +131,7 @@ impl CubeTableSymbol {
 
 pub struct CubeTableSymbolFactory {
     cube_name: String,
-    sql: Rc<dyn MemberSql>,
+    sql: Option<Rc<dyn MemberSql>>,
     definition: Rc<dyn CubeDefinition>,
     is_table_sql: bool,
 }
@@ -135,15 +145,7 @@ impl CubeTableSymbolFactory {
         let table_sql = definition.sql_table()?;
         let is_table_sql = table_sql.is_some();
         let sql = definition.sql()?;
-        let sql = if let Some(sql) = table_sql.or(sql) {
-            sql
-        } else {
-            return Err(CubeError::user(format!(
-                "Cube {} sould have sql or sqlTable field",
-                cube_name
-            )));
-        };
-
+        let sql = table_sql.or(sql);
         Ok(Self {
             cube_name: cube_name.clone(),
             sql,
@@ -163,11 +165,14 @@ impl SymbolFactory for CubeTableSymbolFactory {
     }
 
     fn deps_names(&self) -> Result<Vec<String>, CubeError> {
-        Ok(self.sql.args_names().clone())
+        Ok(self
+            .sql
+            .as_ref()
+            .map_or_else(|| vec![], |sql| sql.args_names().clone()))
     }
 
     fn member_sql(&self) -> Option<Rc<dyn MemberSql>> {
-        Some(self.sql.clone())
+        self.sql.clone()
     }
 
     fn build(self, compiler: &mut Compiler) -> Result<Rc<MemberSymbol>, CubeError> {
@@ -177,7 +182,11 @@ impl SymbolFactory for CubeTableSymbolFactory {
             definition,
             is_table_sql,
         } = self;
-        let sql = compiler.compile_sql_call(&cube_name, sql)?;
+        let sql = if let Some(sql) = sql {
+            Some(compiler.compile_sql_call(&cube_name, sql)?)
+        } else {
+            None
+        };
         Ok(MemberSymbol::new_cube_table(CubeTableSymbol::new(
             cube_name,
             sql,
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_symbol.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_symbol.rs
index 40ec863b6e..c574afd0e0 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_symbol.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_symbol.rs
@@ -1,16 +1,19 @@
 use super::{MemberSymbol, SymbolFactory};
 use crate::cube_bridge::dimension_definition::DimensionDefinition;
 use crate::cube_bridge::evaluator::CubeEvaluator;
-use crate::cube_bridge::memeber_sql::MemberSql;
+use crate::cube_bridge::member_sql::MemberSql;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::{sql_nodes::SqlNode, Compiler, SqlCall, SqlEvaluatorVisitor};
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 
 pub struct DimensionSymbol {
     cube_name: String,
     name: String,
-    member_sql: Rc<SqlCall>,
+    member_sql: Option<Rc<SqlCall>>,
+    latitude: Option<Rc<SqlCall>>,
+    longitude: Option<Rc<SqlCall>>,
     #[allow(dead_code)]
     definition: Rc<dyn DimensionDefinition>,
 }
@@ -19,13 +22,17 @@ impl DimensionSymbol {
     pub fn new(
         cube_name: String,
         name: String,
-        member_sql: Rc<SqlCall>,
+        member_sql: Option<Rc<SqlCall>>,
+        latitude: Option<Rc<SqlCall>>,
+        longitude: Option<Rc<SqlCall>>,
         definition: Rc<dyn DimensionDefinition>,
     ) -> Self {
         Self {
             cube_name,
             name,
             member_sql,
+            latitude,
+            longitude,
             definition,
         }
     }
@@ -35,9 +42,29 @@ impl DimensionSymbol {
         visitor: &SqlEvaluatorVisitor,
         node_processor: Rc<dyn SqlNode>,
         query_tools: Rc<QueryTools>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
-        let sql = self.member_sql.eval(visitor, node_processor, query_tools)?;
-        Ok(sql)
+        if let Some(member_sql) = &self.member_sql {
+            let sql = member_sql.eval(visitor, node_processor, query_tools, templates)?;
+            Ok(sql)
+        } else {
+            Err(CubeError::internal(format!(
+                "Dimension {} hasn't sql evaluator",
+                self.full_name()
+            )))
+        }
+    }
+
+    pub fn latitude(&self) -> Option<Rc<SqlCall>> {
+        self.latitude.clone()
+    }
+
+    pub fn longitude(&self) -> Option<Rc<SqlCall>> {
+        self.longitude.clone()
+    }
+
+    pub fn member_sql(&self) -> &Option<Rc<SqlCall>> {
+        &self.member_sql
     }
 
     pub fn full_name(&self) -> String {
@@ -51,15 +78,48 @@ impl DimensionSymbol {
     pub fn is_multi_stage(&self) -> bool {
         self.definition.static_data().multi_stage.unwrap_or(false)
     }
+
+    pub fn is_sub_query(&self) -> bool {
+        self.definition.static_data().sub_query.unwrap_or(false)
+    }
+
+    pub fn dimension_type(&self) -> &String {
+        &self.definition.static_data().dimension_type
+    }
+
     pub fn get_dependencies(&self) -> Vec<Rc<MemberSymbol>> {
         let mut deps = vec![];
-        self.member_sql.extract_symbol_deps(&mut deps);
+        if let Some(member_sql) = &self.member_sql {
+            member_sql.extract_symbol_deps(&mut deps);
+        }
+        if let Some(member_sql) = &self.latitude {
+            member_sql.extract_symbol_deps(&mut deps);
+        }
+        if let Some(member_sql) = &self.longitude {
+            member_sql.extract_symbol_deps(&mut deps);
+        }
+        deps
+    }
+
+    pub fn get_dependencies_with_path(&self) -> Vec<(Rc<MemberSymbol>, Vec<String>)> {
+        let mut deps = vec![];
+        if let Some(member_sql) = &self.member_sql {
+            member_sql.extract_symbol_deps_with_path(&mut deps);
+        }
+        if let Some(member_sql) = &self.latitude {
+            member_sql.extract_symbol_deps_with_path(&mut deps);
+        }
+        if let Some(member_sql) = &self.longitude {
+            member_sql.extract_symbol_deps_with_path(&mut deps);
+        }
         deps
     }
 
     pub fn get_dependent_cubes(&self) -> Vec<String> {
         let mut cubes = vec![];
-        self.member_sql.extract_cube_deps(&mut cubes);
+        if let Some(member_sql) = &self.member_sql {
+            member_sql.extract_cube_deps(&mut cubes);
+        }
         cubes
     }
 
@@ -67,6 +127,10 @@ impl DimensionSymbol {
         &self.cube_name
     }
 
+    pub fn definition(&self) -> &Rc<dyn DimensionDefinition> {
+        &self.definition
+    }
+
     pub fn name(&self) -> &String {
         &self.name
     }
@@ -75,7 +139,7 @@ impl DimensionSymbol {
 pub struct DimensionSymbolFactory {
     cube_name: String,
     name: String,
-    sql: Rc<dyn MemberSql>,
+    sql: Option<Rc<dyn MemberSql>>,
     definition: Rc<dyn DimensionDefinition>,
 }
 
@@ -109,11 +173,15 @@ impl SymbolFactory for DimensionSymbolFactory {
     }
 
     fn deps_names(&self) -> Result<Vec<String>, CubeError> {
-        Ok(self.definition.sql()?.args_names().clone())
+        if let Some(member_sql) = &self.sql {
+            Ok(member_sql.args_names().clone())
+        } else {
+            Ok(vec![])
+        }
     }
 
     fn member_sql(&self) -> Option<Rc<dyn MemberSql>> {
-        Some(self.sql.clone())
+        self.sql.clone()
     }
 
     fn build(self, compiler: &mut Compiler) -> Result<Rc<MemberSymbol>, CubeError> {
@@ -123,9 +191,29 @@ impl SymbolFactory for DimensionSymbolFactory {
             sql,
             definition,
         } = self;
-        let sql = compiler.compile_sql_call(&cube_name, sql)?;
+        let sql = if let Some(sql) = sql {
+            Some(compiler.compile_sql_call(&cube_name, sql)?)
+        } else {
+            None
+        };
+        let (latitude, longitude) = if definition.static_data().dimension_type == "geo" {
+            if let (Some(latitude_item), Some(longitude_item)) =
+                (definition.latitude()?, definition.longitude()?)
+            {
+                let latitude = compiler.compile_sql_call(&cube_name, latitude_item.sql()?)?;
+                let longitude = compiler.compile_sql_call(&cube_name, longitude_item.sql()?)?;
+                (Some(latitude), Some(longitude))
+            } else {
+                return Err(CubeError::user(format!(
+                    "Geo dimension '{}.{}'must have latitude and longitude",
+                    cube_name, name
+                )));
+            }
+        } else {
+            (None, None)
+        };
         Ok(MemberSymbol::new_dimension(DimensionSymbol::new(
-            cube_name, name, sql, definition,
+            cube_name, name, sql, latitude, longitude, definition,
         )))
     }
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/measure_symbol.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/measure_symbol.rs
index 7ef7024e70..e827878aee 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/measure_symbol.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/measure_symbol.rs
@@ -3,9 +3,10 @@ use crate::cube_bridge::evaluator::CubeEvaluator;
 use crate::cube_bridge::measure_definition::{
     MeasureDefinition, RollingWindow, TimeShiftReference,
 };
-use crate::cube_bridge::memeber_sql::MemberSql;
+use crate::cube_bridge::member_sql::MemberSql;
 use crate::planner::query_tools::QueryTools;
 use crate::planner::sql_evaluator::{sql_nodes::SqlNode, Compiler, SqlCall, SqlEvaluatorVisitor};
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 
@@ -38,8 +39,10 @@ pub struct MeasureSymbol {
     name: String,
     definition: Rc<dyn MeasureDefinition>,
     measure_filters: Vec<Rc<SqlCall>>,
+    measure_drill_filters: Vec<Rc<SqlCall>>,
     measure_order_by: Vec<MeasureOrderBy>,
-    member_sql: Rc<SqlCall>,
+    member_sql: Option<Rc<SqlCall>>,
+    pk_sqls: Vec<Rc<SqlCall>>,
     is_splitted_source: bool,
 }
 
@@ -47,17 +50,21 @@ impl MeasureSymbol {
     pub fn new(
         cube_name: String,
         name: String,
-        member_sql: Rc<SqlCall>,
+        member_sql: Option<Rc<SqlCall>>,
+        pk_sqls: Vec<Rc<SqlCall>>,
         definition: Rc<dyn MeasureDefinition>,
         measure_filters: Vec<Rc<SqlCall>>,
+        measure_drill_filters: Vec<Rc<SqlCall>>,
         measure_order_by: Vec<MeasureOrderBy>,
     ) -> Self {
         Self {
             cube_name,
             name,
             member_sql,
+            pk_sqls,
             definition,
             measure_filters,
+            measure_drill_filters,
             measure_order_by,
             is_splitted_source: false,
         }
@@ -71,18 +78,8 @@ impl MeasureSymbol {
         self.is_splitted_source
     }
 
-    pub fn split_with_source(&self, source_name: String) -> (Self, Self) {
-        let mut measure_with_source = self.clone();
-        measure_with_source.is_splitted_source = true;
-        let source = Self::new(
-            self.cube_name.clone(),
-            source_name.clone(),
-            self.member_sql.clone(),
-            self.definition().clone(),
-            self.measure_filters.clone(),
-            self.measure_order_by.clone(),
-        );
-        (measure_with_source, source)
+    pub fn pk_sqls(&self) -> &Vec<Rc<SqlCall>> {
+        &self.pk_sqls
     }
 
     pub fn is_calculated(&self) -> bool {
@@ -97,29 +94,77 @@ impl MeasureSymbol {
         visitor: &SqlEvaluatorVisitor,
         node_processor: Rc<dyn SqlNode>,
         query_tools: Rc<QueryTools>,
+        templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
-        let sql = self.member_sql.eval(visitor, node_processor, query_tools)?;
-        Ok(sql)
+        if let Some(member_sql) = &self.member_sql {
+            let sql = member_sql.eval(visitor, node_processor, query_tools, templates)?;
+            Ok(sql)
+        } else {
+            Err(CubeError::internal(format!(
+                "Measure {} hasn't sql evaluator",
+                self.full_name()
+            )))
+        }
+    }
+
+    pub fn has_sql(&self) -> bool {
+        self.member_sql.is_some()
     }
 
     pub fn get_dependencies(&self) -> Vec<Rc<MemberSymbol>> {
         let mut deps = vec![];
-        self.member_sql.extract_symbol_deps(&mut deps);
+        if let Some(member_sql) = &self.member_sql {
+            member_sql.extract_symbol_deps(&mut deps);
+        }
+        for pk in self.pk_sqls.iter() {
+            pk.extract_symbol_deps(&mut deps);
+        }
         for filter in self.measure_filters.iter() {
             filter.extract_symbol_deps(&mut deps);
         }
+        for filter in self.measure_drill_filters.iter() {
+            filter.extract_symbol_deps(&mut deps);
+        }
         for order in self.measure_order_by.iter() {
             order.sql_call().extract_symbol_deps(&mut deps);
         }
         deps
     }
 
+    pub fn get_dependencies_with_path(&self) -> Vec<(Rc<MemberSymbol>, Vec<String>)> {
+        let mut deps = vec![];
+        if let Some(member_sql) = &self.member_sql {
+            member_sql.extract_symbol_deps_with_path(&mut deps);
+        }
+        for pk in self.pk_sqls.iter() {
+            pk.extract_symbol_deps_with_path(&mut deps);
+        }
+        for filter in self.measure_filters.iter() {
+            filter.extract_symbol_deps_with_path(&mut deps);
+        }
+        for filter in self.measure_drill_filters.iter() {
+            filter.extract_symbol_deps_with_path(&mut deps);
+        }
+        for order in self.measure_order_by.iter() {
+            order.sql_call().extract_symbol_deps_with_path(&mut deps);
+        }
+        deps
+    }
+
     pub fn get_dependent_cubes(&self) -> Vec<String> {
         let mut cubes = vec![];
-        self.member_sql.extract_cube_deps(&mut cubes);
+        if let Some(member_sql) = &self.member_sql {
+            member_sql.extract_cube_deps(&mut cubes);
+        }
+        for pk in self.pk_sqls.iter() {
+            pk.extract_cube_deps(&mut cubes);
+        }
         for filter in self.measure_filters.iter() {
             filter.extract_cube_deps(&mut cubes);
         }
+        for filter in self.measure_drill_filters.iter() {
+            filter.extract_cube_deps(&mut cubes);
+        }
         for order in self.measure_order_by.iter() {
             order.sql_call().extract_cube_deps(&mut cubes);
         }
@@ -157,6 +202,10 @@ impl MeasureSymbol {
         &self.measure_filters
     }
 
+    pub fn measure_drill_filters(&self) -> &Vec<Rc<SqlCall>> {
+        &self.measure_drill_filters
+    }
+
     pub fn measure_order_by(&self) -> &Vec<MeasureOrderBy> {
         &self.measure_order_by
     }
@@ -184,8 +233,9 @@ impl MeasureSymbol {
 pub struct MeasureSymbolFactory {
     cube_name: String,
     name: String,
-    sql: Rc<dyn MemberSql>,
+    sql: Option<Rc<dyn MemberSql>>,
     definition: Rc<dyn MeasureDefinition>,
+    cube_evaluator: Rc<dyn CubeEvaluator>,
 }
 
 impl MeasureSymbolFactory {
@@ -199,24 +249,13 @@ impl MeasureSymbolFactory {
         let cube_name = iter.next().unwrap();
         let name = iter.next().unwrap();
         let definition = cube_evaluator.measure_by_path(full_name.clone())?;
-        let sql = if let Some(sql) = definition.sql()? {
-            sql
-        } else {
-            let primary_keys = cube_evaluator
-                .static_data()
-                .primary_keys
-                .get(&cube_name)
-                .unwrap();
-            let primary_key = primary_keys.first().unwrap();
-            let key_dimension =
-                cube_evaluator.dimension_by_path(format!("{}.{}", cube_name, primary_key))?;
-            key_dimension.sql()?
-        };
+        let sql = definition.sql()?;
         Ok(Self {
             cube_name,
             name,
             sql,
             definition,
+            cube_evaluator,
         })
     }
 }
@@ -230,11 +269,11 @@ impl SymbolFactory for MeasureSymbolFactory {
     }
 
     fn member_sql(&self) -> Option<Rc<dyn MemberSql>> {
-        Some(self.sql.clone())
+        self.sql.clone()
     }
 
     fn deps_names(&self) -> Result<Vec<String>, CubeError> {
-        if let Some(member_sql) = self.definition.sql()? {
+        if let Some(member_sql) = &self.sql {
             Ok(member_sql.args_names().clone())
         } else {
             Ok(vec![])
@@ -247,30 +286,71 @@ impl SymbolFactory for MeasureSymbolFactory {
             name,
             sql,
             definition,
+            cube_evaluator,
         } = self;
+        let pk_sqls = if sql.is_none() {
+            cube_evaluator
+                .static_data()
+                .primary_keys
+                .get(&cube_name)
+                .cloned()
+                .unwrap_or_else(|| vec![])
+                .into_iter()
+                .map(|primary_key| -> Result<_, CubeError> {
+                    let key_dimension_name = format!("{}.{}", cube_name, primary_key);
+                    let key_dimension =
+                        cube_evaluator.dimension_by_path(key_dimension_name.clone())?;
+                    let key_dimension_sql = if let Some(key_dimension_sql) = key_dimension.sql()? {
+                        Ok(key_dimension_sql)
+                    } else {
+                        Err(CubeError::internal(format!(
+                            "Key dimension {} hasn't sql evaluator",
+                            key_dimension_name
+                        )))
+                    }?;
+                    compiler.compile_sql_call(&cube_name, key_dimension_sql)
+                })
+                .collect::<Result<Vec<_>, _>>()?
+        } else {
+            vec![]
+        };
         let mut measure_filters = vec![];
         if let Some(filters) = definition.filters()? {
-            for filter in filters.items().iter() {
+            for filter in filters.iter() {
                 let node = compiler.compile_sql_call(&cube_name, filter.sql()?)?;
                 measure_filters.push(node);
             }
         }
 
+        let mut measure_drill_filters = vec![];
+        if let Some(filters) = definition.drill_filters()? {
+            for filter in filters.iter() {
+                let node = compiler.compile_sql_call(&cube_name, filter.sql()?)?;
+                measure_drill_filters.push(node);
+            }
+        }
+
         let mut measure_order_by = vec![];
         if let Some(group_by) = definition.order_by()? {
-            for item in group_by.items().iter() {
+            for item in group_by.iter() {
                 let node = compiler.compile_sql_call(&cube_name, item.sql()?)?;
                 measure_order_by.push(MeasureOrderBy::new(node, item.dir()?));
             }
         }
-        let sql = compiler.compile_sql_call(&cube_name, sql)?;
+        let sql = if let Some(sql) = sql {
+            Some(compiler.compile_sql_call(&cube_name, sql)?)
+        } else {
+            None
+        };
 
         Ok(MemberSymbol::new_measure(MeasureSymbol::new(
             cube_name,
             name,
             sql,
+            pk_sqls,
             definition,
             measure_filters,
+            measure_drill_filters,
             measure_order_by,
         )))
     }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/member_expression_symbol.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/member_expression_symbol.rs
new file mode 100644
index 0000000000..d72603a572
--- /dev/null
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/member_expression_symbol.rs
@@ -0,0 +1,71 @@
+use super::MemberSymbol;
+use crate::planner::query_tools::QueryTools;
+use crate::planner::sql_evaluator::{sql_nodes::SqlNode, SqlCall, SqlEvaluatorVisitor};
+use crate::planner::sql_templates::PlanSqlTemplates;
+use cubenativeutils::CubeError;
+use std::rc::Rc;
+
+pub struct MemberExpressionSymbol {
+    cube_name: String,
+    name: String,
+    expression: Rc<SqlCall>,
+    #[allow(dead_code)]
+    definition: Option<String>,
+}
+
+impl MemberExpressionSymbol {
+    pub fn new(
+        cube_name: String,
+        name: String,
+        expression: Rc<SqlCall>,
+        definition: Option<String>,
+    ) -> Self {
+        Self {
+            cube_name,
+            name,
+            expression,
+            definition,
+        }
+    }
+
+    pub fn evaluate_sql(
+        &self,
+        visitor: &SqlEvaluatorVisitor,
+        node_processor: Rc<dyn SqlNode>,
+        query_tools: Rc<QueryTools>,
+        templates: &PlanSqlTemplates,
+    ) -> Result<String, CubeError> {
+        let sql = self
+            .expression
+            .eval(visitor, node_processor, query_tools, templates)?;
+        Ok(sql)
+    }
+
+    pub fn expression(&self) -> &Rc<SqlCall> {
+        &self.expression
+    }
+
+    pub fn full_name(&self) -> String {
+        format!("expr:{}.{}", self.cube_name, self.name)
+    }
+
+    pub fn get_dependencies(&self) -> Vec<Rc<MemberSymbol>> {
+        let mut deps = vec![];
+        self.expression.extract_symbol_deps(&mut deps);
+        deps
+    }
+
+    pub fn get_dependencies_with_path(&self) -> Vec<(Rc<MemberSymbol>, Vec<String>)> {
+        let mut deps = vec![];
+        self.expression.extract_symbol_deps_with_path(&mut deps);
+        deps
+    }
+
+    pub fn cube_name(&self) -> &String {
+        &self.cube_name
+    }
+
+    pub fn name(&self) -> &String {
+        &self.name
+    }
+}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/member_symbol.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/member_symbol.rs
index ac62b640e5..442e52312c 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/member_symbol.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/member_symbol.rs
@@ -1,11 +1,16 @@
-use super::{CubeNameSymbol, CubeTableSymbol, DimensionSymbol, MeasureSymbol};
+use super::{
+    CubeNameSymbol, CubeTableSymbol, DimensionSymbol, MeasureSymbol, MemberExpressionSymbol,
+    TimeDimensionSymbol,
+};
 use std::rc::Rc;
 
 pub enum MemberSymbol {
     Dimension(DimensionSymbol),
+    TimeDimension(TimeDimensionSymbol),
     Measure(MeasureSymbol),
     CubeName(CubeNameSymbol),
     CubeTable(CubeTableSymbol),
+    MemberExpression(MemberExpressionSymbol),
 }
 
 impl MemberSymbol {
@@ -28,49 +33,62 @@ impl MemberSymbol {
     pub fn full_name(&self) -> String {
         match self {
             Self::Dimension(d) => d.full_name(),
+            Self::TimeDimension(d) => d.full_name(),
             Self::Measure(m) => m.full_name(),
             Self::CubeName(c) => c.cube_name().clone(),
             Self::CubeTable(c) => c.cube_name().clone(),
+            Self::MemberExpression(e) => e.full_name().clone(),
         }
     }
     pub fn name(&self) -> String {
         match self {
             Self::Dimension(d) => d.name().clone(),
+            Self::TimeDimension(d) => d.name(),
             Self::Measure(m) => m.name().clone(),
             Self::CubeName(c) => c.cube_name().clone(),
             Self::CubeTable(c) => c.cube_name().clone(),
+            Self::MemberExpression(e) => e.name().clone(),
         }
     }
 
     pub fn cube_name(&self) -> String {
         match self {
             Self::Dimension(d) => d.cube_name().clone(),
+            Self::TimeDimension(d) => d.cube_name(),
             Self::Measure(m) => m.cube_name().clone(),
             Self::CubeName(c) => c.cube_name().clone(),
             Self::CubeTable(c) => c.cube_name().clone(),
+            Self::MemberExpression(e) => e.cube_name().clone(),
         }
     }
+
     pub fn is_measure(&self) -> bool {
         matches!(self, Self::Measure(_))
     }
+
     pub fn is_dimension(&self) -> bool {
-        matches!(self, Self::Dimension(_))
+        matches!(self, Self::Dimension(_) | Self::TimeDimension(_))
     }
+
     pub fn get_dependencies(&self) -> Vec<Rc<MemberSymbol>> {
         match self {
             Self::Dimension(d) => d.get_dependencies(),
+            Self::TimeDimension(d) => d.get_dependencies(),
             Self::Measure(m) => m.get_dependencies(),
             Self::CubeName(_) => vec![],
             Self::CubeTable(_) => vec![],
+            Self::MemberExpression(e) => e.get_dependencies(),
         }
     }
 
-    pub fn get_dependent_cubes(&self) -> Vec<String> {
+    pub fn get_dependencies_with_path(&self) -> Vec<(Rc<MemberSymbol>, Vec<String>)> {
         match self {
-            Self::Dimension(d) => d.get_dependent_cubes(),
-            Self::Measure(m) => m.get_dependent_cubes(),
+            Self::Dimension(d) => d.get_dependencies_with_path(),
+            Self::TimeDimension(d) => d.get_dependencies_with_path(),
+            Self::Measure(m) => m.get_dependencies_with_path(),
             Self::CubeName(_) => vec![],
             Self::CubeTable(_) => vec![],
+            Self::MemberExpression(e) => e.get_dependencies_with_path(),
         }
     }
 
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/mod.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/mod.rs
index ddb631648d..9a47779d4f 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/mod.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/mod.rs
@@ -1,13 +1,17 @@
 mod cube_symbol;
 mod dimension_symbol;
 mod measure_symbol;
+mod member_expression_symbol;
 mod member_symbol;
 mod symbol_factory;
+mod time_dimension_symbol;
 
 pub use cube_symbol::{
     CubeNameSymbol, CubeNameSymbolFactory, CubeTableSymbol, CubeTableSymbolFactory,
 };
 pub use dimension_symbol::{DimensionSymbol, DimensionSymbolFactory};
 pub use measure_symbol::{MeasureSymbol, MeasureSymbolFactory};
+pub use member_expression_symbol::MemberExpressionSymbol;
 pub use member_symbol::MemberSymbol;
 pub use symbol_factory::SymbolFactory;
+pub use time_dimension_symbol::TimeDimensionSymbol;
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/symbol_factory.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/symbol_factory.rs
index c0e681412c..53e0e6e665 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/symbol_factory.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/symbol_factory.rs
@@ -1,5 +1,5 @@
 use super::MemberSymbol;
-use crate::cube_bridge::memeber_sql::MemberSql;
+use crate::cube_bridge::member_sql::MemberSql;
 use crate::planner::sql_evaluator::Compiler;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/time_dimension_symbol.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/time_dimension_symbol.rs
new file mode 100644
index 0000000000..590584e872
--- /dev/null
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/time_dimension_symbol.rs
@@ -0,0 +1,52 @@
+use super::MemberSymbol;
+use std::rc::Rc;
+
+pub struct TimeDimensionSymbol {
+    base_symbol: Rc<MemberSymbol>,
+    full_name: String,
+    granularity: Option<String>,
+}
+
+impl TimeDimensionSymbol {
+    pub fn new(base_symbol: Rc<MemberSymbol>, granularity: Option<String>) -> Self {
+        let name_suffix = if let Some(granularity) = &granularity {
+            granularity.clone()
+        } else {
+            "day".to_string()
+        };
+        let full_name = format!("{}_{}", base_symbol.full_name(), name_suffix);
+        Self {
+            base_symbol,
+            granularity,
+            full_name,
+        }
+    }
+
+    pub fn base_symbol(&self) -> &Rc<MemberSymbol> {
+        &self.base_symbol
+    }
+
+    pub fn granularity(&self) -> &Option<String> {
+        &self.granularity
+    }
+
+    pub fn full_name(&self) -> String {
+        self.full_name.clone()
+    }
+
+    pub fn get_dependencies(&self) -> Vec<Rc<MemberSymbol>> {
+        self.base_symbol.get_dependencies()
+    }
+
+    pub fn get_dependencies_with_path(&self) -> Vec<(Rc<MemberSymbol>, Vec<String>)> {
+        self.base_symbol.get_dependencies_with_path()
+    }
+
+    pub fn cube_name(&self) -> String {
+        self.base_symbol.cube_name()
+    }
+
+    pub fn name(&self) -> String {
+        self.base_symbol.name()
+    }
+}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/visitor.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/visitor.rs
index abef52ceea..7f4a43980b 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/visitor.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/visitor.rs
@@ -7,13 +7,23 @@ pub trait TraversalVisitor {
     fn on_node_traverse(
         &mut self,
         node: &Rc<MemberSymbol>,
+        path: &Vec<String>,
         state: &Self::State,
     ) -> Result<Option<Self::State>, CubeError>;
 
     fn apply(&mut self, node: &Rc<MemberSymbol>, state: &Self::State) -> Result<(), CubeError> {
-        if let Some(state) = self.on_node_traverse(node, state)? {
-            for dep in node.get_dependencies() {
-                self.apply(&dep, &state)?
+        self.apply_with_path(node, &vec![], state)
+    }
+
+    fn apply_with_path(
+        &mut self,
+        node: &Rc<MemberSymbol>,
+        path: &Vec<String>,
+        state: &Self::State,
+    ) -> Result<(), CubeError> {
+        if let Some(state) = self.on_node_traverse(node, path, state)? {
+            for (dep, dep_path) in node.get_dependencies_with_path() {
+                self.apply_with_path(&dep, &dep_path, &state)?
             }
         }
         Ok(())
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_templates/filter.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_templates/filter.rs
index 6ee5d9a3f6..7b12a74ef2 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_templates/filter.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_templates/filter.rs
@@ -152,6 +152,10 @@ impl FilterTemplates {
         )
     }
 
+    pub fn always_true(&self) -> Result<String, CubeError> {
+        Ok(self.render.get_template("filters/always_true")?.clone())
+    }
+
     pub fn gte(&self, column: String, param: String) -> Result<String, CubeError> {
         self.render.render_template(
             &"filters/gte",
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_templates/plan.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_templates/plan.rs
index f93a915533..e83ee51d55 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_templates/plan.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_templates/plan.rs
@@ -105,6 +105,43 @@ impl PlanSqlTemplates {
         )
     }
 
+    pub fn cast(&self, expr: &str, data_type: &str) -> Result<String, CubeError> {
+        self.render.render_template(
+            "expressions/cast",
+            context! {
+                expr => expr,
+                data_type => data_type,
+            },
+        )
+    }
+
+    pub fn cast_to_string(&self, expr: &str) -> Result<String, CubeError> {
+        self.render.render_template(
+            "expressions/cast_to_string",
+            context! {
+                expr => expr,
+            },
+        )
+    }
+
+    pub fn count_distinct(&self, expr: &str) -> Result<String, CubeError> {
+        self.render.render_template(
+            "functions/COUNT_DISTINCT",
+            context! {
+                args_concat => expr,
+            },
+        )
+    }
+
+    pub fn concat_strings(&self, strings: &Vec<String>) -> Result<String, CubeError> {
+        self.render.render_template(
+            "expressions/concat_strings",
+            context! {
+                strings => strings,
+            },
+        )
+    }
+
     pub fn group_by(&self, items: Vec<TemplateGroupByColumn>) -> Result<String, CubeError> {
         self.render.render_template(
             "statements/group_by_exprs",
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/visitor_context.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/visitor_context.rs
index 7e4cf9137d..0eba5e2f45 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/visitor_context.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/visitor_context.rs
@@ -2,6 +2,7 @@ use super::query_tools::QueryTools;
 use super::sql_evaluator::sql_nodes::{SqlNode, SqlNodesFactory};
 use super::sql_evaluator::{MemberSymbol, SqlCall};
 use crate::planner::sql_evaluator::SqlEvaluatorVisitor;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::rc::Rc;
 
@@ -29,19 +30,21 @@ pub fn evaluate_with_context(
     node: &Rc<MemberSymbol>,
     query_tools: Rc<QueryTools>,
     context: Rc<VisitorContext>,
+    templates: &PlanSqlTemplates,
 ) -> Result<String, CubeError> {
     let visitor = context.make_visitor(query_tools);
     let node_processor = context.node_processor();
 
-    visitor.apply(node, node_processor)
+    visitor.apply(node, node_processor, templates)
 }
 
 pub fn evaluate_sql_call_with_context(
     sql_call: &Rc<SqlCall>,
     query_tools: Rc<QueryTools>,
     context: Rc<VisitorContext>,
+    templates: &PlanSqlTemplates,
 ) -> Result<String, CubeError> {
     let visitor = context.make_visitor(query_tools.clone());
     let node_processor = context.node_processor();
-    sql_call.eval(&visitor, node_processor, query_tools)
+    sql_call.eval(&visitor, node_processor, query_tools, templates)
 }
diff --git a/rust/cubesqlplanner/nativebridge/src/lib.rs b/rust/cubesqlplanner/nativebridge/src/lib.rs
index c889ca2933..fd2dff5ac1 100644
--- a/rust/cubesqlplanner/nativebridge/src/lib.rs
+++ b/rust/cubesqlplanner/nativebridge/src/lib.rs
@@ -38,6 +38,7 @@ enum NativeMethodType {
 struct NativeMethodParams {
     pub method_type: NativeMethodType,
     pub is_optional: bool,
+    pub is_vec: bool,
 }
 
 impl Default for NativeMethodParams {
@@ -45,12 +46,14 @@ impl Default for NativeMethodParams {
         Self {
             method_type: NativeMethodType::Call,
             is_optional: false,
+            is_vec: false,
         }
     }
 }
 
 struct NativeOutputParams {
     type_path: Path,
+    original_type: Path,
     dynamic_container_path: Option<Path>,
 }
 
@@ -99,6 +102,7 @@ impl Parse for NativeService {
                                 output_params: Self::get_output_for_deserializer(
                                     &method_item.sig.output,
                                     method_params.is_optional,
+                                    method_params.is_vec,
                                 )
                                 .unwrap(),
                                 method_params,
@@ -159,6 +163,9 @@ impl NativeService {
                     "field" => {
                         method_params.method_type = NativeMethodType::Getter;
                     }
+                    "vec" => {
+                        method_params.is_vec = true;
+                    }
                     _ => {}
                 }
             }
@@ -168,12 +175,15 @@ impl NativeService {
     fn get_output_for_deserializer(
         tp: &ReturnType,
         optional: bool,
+        vec: bool,
     ) -> syn::Result<NativeOutputParams> {
-        let expected_type = if optional {
-            "Result<_>"
-        } else {
-            "Result<Option<_>>"
-        };
+        let mut expected_type = "Result<_>".to_string();
+        if optional {
+            expected_type = expected_type.replace("_", "Option<_>");
+        }
+        if vec {
+            expected_type = expected_type.replace("_", "Vec<_>");
+        }
         let s = match tp {
             ReturnType::Default => Err(syn::Error::new(
                 tp.span(),
@@ -182,7 +192,7 @@ impl NativeService {
             ReturnType::Type(_, tt) => match tt.as_ref() {
                 syn::Type::Path(tp) => {
                     let segs = &tp.path.segments;
-                    Self::get_deserializer_output_for_result(segs, optional)
+                    Self::get_deserializer_output_for_result(segs, optional, vec, &expected_type)
                 }
                 _ => Err(syn::Error::new(
                     tp.span(),
@@ -196,18 +206,22 @@ impl NativeService {
     fn get_deserializer_output_for_result(
         segs: &Punctuated<PathSegment, Colon2>,
         optional: bool,
+        vec: bool,
+        expected_type: &str,
     ) -> syn::Result<NativeOutputParams> {
         let seg = segs.last().ok_or(syn::Error::new(
             segs.span(),
             "Return type should be Result<_>",
         ))?;
         if seg.ident.to_string() == "Result" {
-            let args = &seg.arguments;
+            let mut args = seg.arguments.clone();
             if optional {
-                Self::get_deserializer_output_for_option(args)
-            } else {
-                Self::get_type_for_deserialize_from_result_args(args)
+                args = Self::extract_output_for_nested_type(&args, "Option", expected_type)?;
             }
+            if vec {
+                args = Self::extract_output_for_nested_type(&args, "Vec", expected_type)?;
+            }
+            Self::get_type_for_deserialize_from_result_args(&args, expected_type)
         } else {
             Err(syn::Error::new(
                 seg.span(),
@@ -216,13 +230,18 @@ impl NativeService {
         }
     }
 
-    fn get_deserializer_output_for_option(args: &PathArguments) -> syn::Result<NativeOutputParams> {
+    fn extract_output_for_nested_type(
+        args: &PathArguments,
+        type_to_extract: &str,
+        expected_type: &str,
+    ) -> syn::Result<PathArguments> {
+        let error_message = format!("Return type should be {expected_type}");
         match args {
             syn::PathArguments::AngleBracketed(args) => {
-                let arg = args.args.first().ok_or(syn::Error::new(
-                    args.span(),
-                    "Return type should be Result<Option<_>>",
-                ))?;
+                let arg = args
+                    .args
+                    .first()
+                    .ok_or(syn::Error::new(args.span(), error_message.clone()))?;
                 match arg {
                     syn::GenericArgument::Type(tp) => match tp {
                         Type::Path(tp) => {
@@ -231,55 +250,39 @@ impl NativeService {
                                 tp.span(),
                                 "Return type should be Result<Option<_>>",
                             ))?;
-                            if seg.ident.to_string() == "Option" {
+                            if seg.ident.to_string() == type_to_extract {
                                 let args = &seg.arguments;
-                                Self::get_type_for_deserialize_from_result_args(args)
+                                Ok(args.clone())
                             } else {
-                                Err(syn::Error::new(
-                                    seg.span(),
-                                    "Return type should be Result<Option<_>>",
-                                ))
+                                Err(syn::Error::new(seg.span(), error_message.clone()))
                             }
                         }
-                        _ => Err(syn::Error::new(
-                            arg.span(),
-                            "Return type should be Result<Option<_>>",
-                        )),
+                        _ => Err(syn::Error::new(arg.span(), error_message.clone())),
                     },
-                    _ => Err(syn::Error::new(
-                        arg.span(),
-                        "Return type should be Result<<Option<_>>",
-                    )),
+                    _ => Err(syn::Error::new(arg.span(), error_message.clone())),
                 }
             }
-            _ => Err(syn::Error::new(
-                args.span(),
-                "Return type should be Result<_>",
-            )),
+            _ => Err(syn::Error::new(args.span(), error_message.clone())),
         }
     }
 
     fn get_type_for_deserialize_from_result_args(
         args: &PathArguments,
+        expected_type: &str,
     ) -> syn::Result<NativeOutputParams> {
+        let error_message = format!("Return type should be {expected_type}");
         match args {
             syn::PathArguments::AngleBracketed(args) => {
-                let arg = args.args.first().ok_or(syn::Error::new(
-                    args.span(),
-                    "Return type should be Result<_>",
-                ))?;
+                let arg = args
+                    .args
+                    .first()
+                    .ok_or(syn::Error::new(args.span(), error_message.clone()))?;
                 match arg {
                     syn::GenericArgument::Type(tp) => Self::get_type_from_possible_dyn_type(tp),
-                    _ => Err(syn::Error::new(
-                        arg.span(),
-                        "Return type should be Result<_>",
-                    )),
+                    _ => Err(syn::Error::new(arg.span(), error_message.clone())),
                 }
             }
-            _ => Err(syn::Error::new(
-                args.span(),
-                "Return type should be Result<_>",
-            )),
+            _ => Err(syn::Error::new(args.span(), error_message.clone())),
         }
     }
 
@@ -297,22 +300,26 @@ impl NativeService {
                     || ident.to_string() == "Box"
                 {
                     if let Some(dyn_path) = Self::get_dyn_type_for_deserialize(&seg.arguments) {
+                        let original_type = tp.path.clone();
                         let mut dynamic_container_path = tp.path.clone();
                         let last_seg = dynamic_container_path.segments.last_mut().unwrap();
                         last_seg.arguments = syn::PathArguments::None;
                         Ok(NativeOutputParams {
                             type_path: dyn_path,
+                            original_type,
                             dynamic_container_path: Some(dynamic_container_path),
                         })
                     } else {
                         Ok(NativeOutputParams {
                             type_path: tp.path.clone(),
+                            original_type: tp.path.clone(),
                             dynamic_container_path: None,
                         })
                     }
                 } else {
                     Ok(NativeOutputParams {
                         type_path: tp.path.clone(),
+                        original_type: tp.path.clone(),
                         dynamic_container_path: None,
                     })
                 }
@@ -524,7 +531,7 @@ impl NativeMethod {
             .collect::<Vec<_>>();
         let js_method_name = self.camel_case_name();
 
-        let deseralization = Self::deserialization_impl(&output_params);
+        let deseralization = Self::deserialization_impl(&output_params, method_params.is_vec);
 
         match method_params.method_type {
             NativeMethodType::Call => {
@@ -607,10 +614,15 @@ impl NativeMethod {
         }
     }
 
-    fn deserialization_impl(output_params: &NativeOutputParams) -> proc_macro2::TokenStream {
+    fn deserialization_impl(
+        output_params: &NativeOutputParams,
+        is_vec: bool,
+    ) -> proc_macro2::TokenStream {
         let output_type = &output_params.type_path;
 
-        if let Some(dynamic_container_path) = &output_params.dynamic_container_path {
+        let single_deserialization = if let Some(dynamic_container_path) =
+            &output_params.dynamic_container_path
+        {
             quote! {
                 #dynamic_container_path::new(NativeDeserializer::deserialize::<IT, #output_type<IT>>(res)?)
             }
@@ -618,6 +630,18 @@ impl NativeMethod {
             quote! {
                 NativeDeserializer::deserialize::<IT, #output_type>(res)?
             }
+        };
+
+        if is_vec {
+            let original_type = &output_params.original_type;
+            quote! {
+                res.into_array()?.to_vec()?.into_iter().map(|res| -> Result<#original_type, CubeError> {
+                    let r = #single_deserialization;
+                    Ok(r)
+                }).collect::<Result<Vec<_>, _>>()?
+            }
+        } else {
+            single_deserialization
         }
     }
 
diff --git a/rust/cubesqlplanner/rust-toolchain.toml b/rust/cubesqlplanner/rust-toolchain.toml
index ef8073e17f..8237034eda 100644
--- a/rust/cubesqlplanner/rust-toolchain.toml
+++ b/rust/cubesqlplanner/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2024-07-15"
+channel = "1.84.1"
 components = ["rustfmt", "rustc-dev", "clippy"]
 profile = "minimal"
diff --git a/rust/cubestore/CHANGELOG.md b/rust/cubestore/CHANGELOG.md
index 2884fd4195..bd38260665 100644
--- a/rust/cubestore/CHANGELOG.md
+++ b/rust/cubestore/CHANGELOG.md
@@ -3,6 +3,62 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.14](https://github.com/cube-js/cube/compare/v1.2.13...v1.2.14) (2025-02-28)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore
+
+## [1.2.13](https://github.com/cube-js/cube/compare/v1.2.12...v1.2.13) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore
+
+## [1.2.12](https://github.com/cube-js/cube/compare/v1.2.11...v1.2.12) (2025-02-26)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore
+
+## [1.2.11](https://github.com/cube-js/cube/compare/v1.2.10...v1.2.11) (2025-02-25)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore
+
+## [1.2.10](https://github.com/cube-js/cube/compare/v1.2.9...v1.2.10) (2025-02-24)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore
+
+## [1.2.9](https://github.com/cube-js/cube/compare/v1.2.8...v1.2.9) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore
+
+## [1.2.8](https://github.com/cube-js/cube/compare/v1.2.7...v1.2.8) (2025-02-21)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore
+
+## [1.2.7](https://github.com/cube-js/cube/compare/v1.2.6...v1.2.7) (2025-02-20)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore
+
+## [1.2.6](https://github.com/cube-js/cube/compare/v1.2.5...v1.2.6) (2025-02-18)
+
+### Features
+
+- **schema-compiler:** Boost models transpilation 10-13x times (using SWC instead of Babel) ([#9225](https://github.com/cube-js/cube/issues/9225)) ([2dd9a4a](https://github.com/cube-js/cube/commit/2dd9a4a5ba0f178e304befc476609fc30ada8975))
+
+## [1.2.4](/compare/v1.2.3...v1.2.4) (2025-02-11)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore
+
+## [1.2.3](https://github.com/cube-js/cube/compare/v1.2.2...v1.2.3) (2025-02-06)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore
+
+## [1.2.2](https://github.com/cube-js/cube/compare/v1.2.1...v1.2.2) (2025-02-06)
+
+### Bug Fixes
+
+- **dremio-driver:** Correct dremio date interval functions ([#9193](https://github.com/cube-js/cube/issues/9193)) ([7cf2287](https://github.com/cube-js/cube/commit/7cf2287e165beff948ddd88eb47bd0048812aa9b))
+
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore
+
 ## [1.1.17](https://github.com/cube-js/cube/compare/v1.1.16...v1.1.17) (2025-01-27)
 
 ### Features
diff --git a/rust/cubestore/Cargo.lock b/rust/cubestore/Cargo.lock
index c6c32d5050..1df7d0ec3f 100644
--- a/rust/cubestore/Cargo.lock
+++ b/rust/cubestore/Cargo.lock
@@ -280,11 +280,11 @@ dependencies = [
 
 [[package]]
 name = "attohttpc"
-version = "0.26.1"
+version = "0.28.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f77d243921b0979fbbd728dd2d5162e68ac8252976797c24eb5b3a6af9090dc"
+checksum = "07a9b245ba0739fc90935094c29adbaee3f977218b5fb95e822e261cda7f56a3"
 dependencies = [
- "http 0.2.12",
+ "http 1.1.0",
  "log",
  "native-tls",
  "serde",
@@ -317,9 +317,8 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "aws-creds"
-version = "0.36.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "390ad3b77f3e21e01a4a0355865853b681daf1988510b0b15e31c0c4ae7eb0f6"
+version = "0.38.0"
+source = "git+https://github.com/cube-js/rust-s3.git?rev=c662b9c66c2929da185c46084fc5f455030ad75f#c662b9c66c2929da185c46084fc5f455030ad75f"
 dependencies = [
  "attohttpc",
  "home",
@@ -1984,12 +1983,6 @@ dependencies = [
  "ahash",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-
 [[package]]
 name = "hashbrown"
 version = "0.14.3"
@@ -3372,12 +3365,12 @@ dependencies = [
 
 [[package]]
 name = "ordered-multimap"
-version = "0.6.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e"
+checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
 dependencies = [
  "dlv-list",
- "hashbrown 0.13.2",
+ "hashbrown 0.14.3",
 ]
 
 [[package]]
@@ -3814,9 +3807,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.30.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
+checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
 dependencies = [
  "memchr",
  "serde",
@@ -4303,18 +4296,19 @@ dependencies = [
 
 [[package]]
 name = "rust-ini"
-version = "0.19.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091"
+checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f"
 dependencies = [
  "cfg-if 1.0.0",
  "ordered-multimap",
+ "trim-in-place",
 ]
 
 [[package]]
 name = "rust-s3"
 version = "0.32.3"
-source = "git+https://github.com/cube-js/rust-s3.git?branch=cubestore-0.32.3-backport#371118db869d59cccc5c84be7b65a6e663052387"
+source = "git+https://github.com/cube-js/rust-s3.git?rev=c662b9c66c2929da185c46084fc5f455030ad75f#c662b9c66c2929da185c46084fc5f455030ad75f"
 dependencies = [
  "async-trait",
  "aws-creds",
@@ -5468,6 +5462,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
 
+[[package]]
+name = "trim-in-place"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc"
+
 [[package]]
 name = "triomphe"
 version = "0.1.5"
@@ -5509,7 +5509,7 @@ version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 0.1.10",
  "rand 0.8.4",
  "static_assertions",
 ]
diff --git a/rust/cubestore/cubestore/Cargo.toml b/rust/cubestore/cubestore/Cargo.toml
index 3e54d4428f..cf20f80253 100644
--- a/rust/cubestore/cubestore/Cargo.toml
+++ b/rust/cubestore/cubestore/Cargo.toml
@@ -57,7 +57,9 @@ bigdecimal = { version = "0.2.0", features = ["serde"] }
 # Right now, it's not possible to use the 0.33 release because it has bugs
 # At the same time, 0.34-rc has a problem with large files uploading because it doesn't control number of parallels put(s)
 # Tracking PR with backports: https://github.com/cube-js/rust-s3/pull/1
-rust-s3 = { git = "https://github.com/cube-js/rust-s3.git", branch = "cubestore-0.32.3-backport", default-features = false, features = ["tokio", "tokio-native-tls"] }
+# The fork also includes a fix for AWS_STS_REGIONAL_ENDPOINTS
+# See https://github.com/cube-js/rust-s3/pull/1/commits for more details
+rust-s3 = { git = "https://github.com/cube-js/rust-s3.git", rev = "c662b9c66c2929da185c46084fc5f455030ad75f", default-features = false, features = ["tokio", "tokio-native-tls"] }
 deadqueue = "0.2.4"
 reqwest = { version = "0.12.5", features = ["json", "rustls-tls", "stream", "http2"], default-features = false }
 nanoid = "0.3.0"
diff --git a/rust/cubestore/package.json b/rust/cubestore/package.json
index 828c52a9df..34b58e4dad 100644
--- a/rust/cubestore/package.json
+++ b/rust/cubestore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-backend/cubestore",
-  "version": "1.1.17",
+  "version": "1.2.14",
   "description": "Cube.js pre-aggregation storage layer.",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -27,9 +27,9 @@
   "author": "Cube Dev, Inc.",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.14",
     "@types/jest": "^27",
-    "@types/node": "^12",
+    "@types/node": "^18",
     "jest": "^27",
     "typescript": "~5.2.2"
   },
@@ -37,7 +37,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/shared": "1.2.14",
     "@octokit/core": "^3.2.5",
     "source-map-support": "^0.5.19"
   },
diff --git a/yarn.lock b/yarn.lock
index 6fb3264d98..c3fb45cd30 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1277,7 +1277,7 @@
     js-tokens "^4.0.0"
     picocolors "^1.0.0"
 
-"@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2":
+"@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24", "@babel/code-frame@^7.24.2":
   version "7.24.2"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae"
   integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==
@@ -1432,22 +1432,13 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.5.tgz#26e1192eb8f78e0a3acaf3eede3c6fc96d22bedf"
-  integrity sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==
-  dependencies:
-    "@babel/types" "^7.16.0"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.16.8", "@babel/generator@^7.26.0", "@babel/generator@^7.26.3":
-  version "7.26.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.3.tgz#ab8d4360544a425c90c248df7059881f4b2ce019"
-  integrity sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==
+"@babel/generator@^7.16.8", "@babel/generator@^7.26.0", "@babel/generator@^7.26.5":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.5.tgz#e44d4ab3176bbcaf78a5725da5f1dc28802a9458"
+  integrity sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==
   dependencies:
-    "@babel/parser" "^7.26.3"
-    "@babel/types" "^7.26.3"
+    "@babel/parser" "^7.26.5"
+    "@babel/types" "^7.26.5"
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^3.0.2"
@@ -2075,16 +2066,6 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-string-parser@^7.23.4":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
-  integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
-
-"@babel/helper-string-parser@^7.25.7":
-  version "7.25.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz#d50e8d37b1176207b4fe9acedec386c565a44a54"
-  integrity sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==
-
 "@babel/helper-string-parser@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"
@@ -2235,12 +2216,12 @@
     js-tokens "^4.0.0"
     picocolors "^1.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.0", "@babel/parser@^7.16.4", "@babel/parser@^7.16.5", "@babel/parser@^7.7.0":
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.0", "@babel/parser@^7.16.4", "@babel/parser@^7.7.0":
   version "7.16.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.5.tgz#beb3af702e54d24796341ab9420fb329131ad658"
   integrity sha512-+Ce7T5iPNWzfu9C1aB5tN3Lyafs5xb3Ic7vBWyZL2KXT3QSdD1dD3CvgOzPmQKoNNRt6uauc0XwNJTQtXC2/Mw==
 
-"@babel/parser@^7.16.12", "@babel/parser@^7.16.7", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3":
+"@babel/parser@^7.16.12", "@babel/parser@^7.16.7", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0":
   version "7.26.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
   integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
@@ -2269,6 +2250,13 @@
   dependencies:
     "@babel/types" "^7.25.8"
 
+"@babel/parser@^7.26.5":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.5.tgz#6fec9aebddef25ca57a935c86dbb915ae2da3e1f"
+  integrity sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==
+  dependencies:
+    "@babel/types" "^7.26.5"
+
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz#cc2e53ebf0a0340777fff5ed521943e253b4d8fe"
@@ -4949,106 +4937,27 @@
     "@babel/parser" "^7.25.7"
     "@babel/types" "^7.25.7"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.5", "@babel/traverse@^7.7.0":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.5.tgz#d7d400a8229c714a59b87624fc67b0f1fbd4b2b3"
-  integrity sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ==
-  dependencies:
-    "@babel/code-frame" "^7.16.0"
-    "@babel/generator" "^7.16.5"
-    "@babel/helper-environment-visitor" "^7.16.5"
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/helper-hoist-variables" "^7.16.0"
-    "@babel/helper-split-export-declaration" "^7.16.0"
-    "@babel/parser" "^7.16.5"
-    "@babel/types" "^7.16.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.16.10", "@babel/traverse@^7.25.9":
-  version "7.26.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.3.tgz#1ebfc75bd748d8f96b3cc63af5e82ebd4c37ba35"
-  integrity sha512-yTmc8J+Sj8yLzwr4PD5Xb/WF3bOYu2C2OoSZPzbuqRm4n98XirsbzaX+GloeO376UnSYIYJ4NCanwV5/ugZkwA==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.10", "@babel/traverse@^7.16.5", "@babel/traverse@^7.23.2", "@babel/traverse@^7.23.3", "@babel/traverse@^7.24", "@babel/traverse@^7.24.1", "@babel/traverse@^7.25.7", "@babel/traverse@^7.25.9", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.5.tgz#6d0be3e772ff786456c1a37538208286f6e79021"
+  integrity sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==
   dependencies:
     "@babel/code-frame" "^7.26.2"
-    "@babel/generator" "^7.26.3"
-    "@babel/parser" "^7.26.3"
+    "@babel/generator" "^7.26.5"
+    "@babel/parser" "^7.26.5"
     "@babel/template" "^7.25.9"
-    "@babel/types" "^7.26.3"
-    debug "^4.3.1"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.23.2", "@babel/traverse@^7.23.3", "@babel/traverse@^7.7.2":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.3.tgz#26ee5f252e725aa7aca3474aa5b324eaf7908b5b"
-  integrity sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==
-  dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.3"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.3"
-    "@babel/types" "^7.23.3"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.24", "@babel/traverse@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c"
-  integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==
-  dependencies:
-    "@babel/code-frame" "^7.24.1"
-    "@babel/generator" "^7.24.1"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.24.1"
-    "@babel/types" "^7.24.0"
+    "@babel/types" "^7.26.5"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/traverse@^7.25.7":
-  version "7.25.7"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.7.tgz#83e367619be1cab8e4f2892ef30ba04c26a40fa8"
-  integrity sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==
-  dependencies:
-    "@babel/code-frame" "^7.25.7"
-    "@babel/generator" "^7.25.7"
-    "@babel/parser" "^7.25.7"
-    "@babel/template" "^7.25.7"
-    "@babel/types" "^7.25.7"
-    debug "^4.3.1"
-    globals "^11.1.0"
-
-"@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3", "@babel/types@^7.24", "@babel/types@^7.24.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
-  integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
-  dependencies:
-    "@babel/helper-string-parser" "^7.23.4"
-    "@babel/helper-validator-identifier" "^7.22.20"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.24.7", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3":
-  version "7.26.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.3.tgz#37e79830f04c2b5687acc77db97fbc75fb81f3c0"
-  integrity sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==
+"@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3", "@babel/types@^7.24", "@babel/types@^7.24.0", "@babel/types@^7.24.7", "@babel/types@^7.25.7", "@babel/types@^7.25.8", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.26.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.5.tgz#7a1e1c01d28e26d1fe7f8ec9567b3b92b9d07747"
+  integrity sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==
   dependencies:
     "@babel/helper-string-parser" "^7.25.9"
     "@babel/helper-validator-identifier" "^7.25.9"
 
-"@babel/types@^7.25.7", "@babel/types@^7.25.8":
-  version "7.25.8"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.8.tgz#5cf6037258e8a9bcad533f4979025140cb9993e1"
-  integrity sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==
-  dependencies:
-    "@babel/helper-string-parser" "^7.25.7"
-    "@babel/helper-validator-identifier" "^7.25.7"
-    to-fast-properties "^2.0.0"
-
 "@balena/dockerignore@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@balena/dockerignore/-/dockerignore-1.0.2.tgz#9ffe4726915251e8eb69f44ef3547e0da2c03e0d"
@@ -5290,6 +5199,23 @@
     usehooks-ts "^3.1.0"
     valid-url "^1.0.9"
 
+"@cubejs-backend/base-driver@1.1.17":
+  version "1.1.17"
+  resolved "https://registry.yarnpkg.com/@cubejs-backend/base-driver/-/base-driver-1.1.17.tgz#d0075db7d3f23c3a7f4778abd8bb665849e68b4e"
+  integrity sha512-Q8GYOTCrj8PFzmng3zWW3b/lL+Uiv2hQKw4w5/EFuEPC+wT3kMSixfOTR5DS/yW+NaZFQ1etr1CmVL49dWbLZA==
+  dependencies:
+    "@aws-sdk/client-s3" "^3.49.0"
+    "@aws-sdk/s3-request-presigner" "^3.49.0"
+    "@azure/identity" "^4.4.1"
+    "@azure/storage-blob" "^12.9.0"
+    "@cubejs-backend/shared" "1.1.17"
+    "@google-cloud/storage" "^7.13.0"
+
+"@cubejs-backend/cubesql@1.1.17":
+  version "1.1.17"
+  resolved "https://registry.yarnpkg.com/@cubejs-backend/cubesql/-/cubesql-1.1.17.tgz#b2b3640054090e896b479c6f2892674ff950a102"
+  integrity sha512-8c1xPgU/tVxFLtxf3/TYAJdF2dHrY+PrE5i2AAonf41LgZWkJYHxxSrP0j2b9oQy48gLxrDCArcIW6c5fMXGiw==
+
 "@cubejs-backend/dotenv@^9.0.2":
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/@cubejs-backend/dotenv/-/dotenv-9.0.2.tgz#c3679091b702f0fd38de120c5a63943fcdc0dcbf"
@@ -5306,6 +5232,44 @@
     uuid "9.0.0"
     winston "3.8.2"
 
+"@cubejs-backend/native@1.1.17":
+  version "1.1.17"
+  resolved "https://registry.yarnpkg.com/@cubejs-backend/native/-/native-1.1.17.tgz#2ade4d3524b784ee287a45404502f181cd192239"
+  integrity sha512-dBxRhiAPf7EPI9C3AqyLrbkO5ne/OD+Qh9ZlCBRdHRbBuM8Ba+0T4fBEwdCjlEk3o8t+fVQOO/rwSFbK6RkrwQ==
+  dependencies:
+    "@cubejs-backend/cubesql" "1.1.17"
+    "@cubejs-backend/shared" "1.1.17"
+    "@cubejs-infra/post-installer" "^0.0.7"
+
+"@cubejs-backend/schema-compiler@1.1.17":
+  version "1.1.17"
+  resolved "https://registry.yarnpkg.com/@cubejs-backend/schema-compiler/-/schema-compiler-1.1.17.tgz#ea10b006753c6cd0735f5d0bff064e72cd123b88"
+  integrity sha512-iK6xbVExughwPUhbJkCLWdefaOILqkHD5joB3BkKxm0tAsp5c1ux3K1Q9zZet1ZEzy/cD2q8j8B/HTMo3Ir1WQ==
+  dependencies:
+    "@babel/code-frame" "^7.24"
+    "@babel/core" "^7.24"
+    "@babel/generator" "^7.24"
+    "@babel/parser" "^7.24"
+    "@babel/preset-env" "^7.24"
+    "@babel/standalone" "^7.24"
+    "@babel/traverse" "^7.24"
+    "@babel/types" "^7.24"
+    "@cubejs-backend/native" "1.1.17"
+    "@cubejs-backend/shared" "1.1.17"
+    antlr4ts "0.5.0-alpha.4"
+    camelcase "^6.2.0"
+    cron-parser "^4.9.0"
+    humps "^2.0.1"
+    inflection "^1.12.0"
+    joi "^17.8.3"
+    js-yaml "^4.1.0"
+    lru-cache "^5.1.1"
+    moment-timezone "^0.5.46"
+    node-dijkstra "^2.5.0"
+    ramda "^0.27.2"
+    syntax-error "^1.3.0"
+    uuid "^8.3.2"
+
 "@cubejs-backend/shared@0.33.20":
   version "0.33.20"
   resolved "https://registry.yarnpkg.com/@cubejs-backend/shared/-/shared-0.33.20.tgz#3d9fa60041599cca9fe4c04df05daa4b8ab8675f"
@@ -5326,6 +5290,26 @@
     throttle-debounce "^3.0.1"
     uuid "^8.3.2"
 
+"@cubejs-backend/shared@1.1.17":
+  version "1.1.17"
+  resolved "https://registry.yarnpkg.com/@cubejs-backend/shared/-/shared-1.1.17.tgz#ae84302dbd3046080c91faba99b9b1f627a627fc"
+  integrity sha512-ejfVjLMwFcLpWd6rIdEeSUEtv1k6DXQb7F2GEjYH8334pqYwsDklFJAzIafSCTA1Q0krG7sNaEdAkvYsd+R5jQ==
+  dependencies:
+    "@oclif/color" "^0.1.2"
+    bytes "^3.1.0"
+    cli-progress "^3.9.0"
+    cross-spawn "^7.0.3"
+    decompress "^4.2.1"
+    env-var "^6.3.0"
+    fs-extra "^9.1.0"
+    http-proxy-agent "^4.0.1"
+    moment-range "^4.0.1"
+    moment-timezone "^0.5.46"
+    node-fetch "^2.6.1"
+    shelljs "^0.8.5"
+    throttle-debounce "^3.0.1"
+    uuid "^8.3.2"
+
 "@cubejs-infra/post-installer@^0.0.7":
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/@cubejs-infra/post-installer/-/post-installer-0.0.7.tgz#a28d2d03e5b7b69a64020d75194a7078cf911d2d"
@@ -7311,15 +7295,15 @@
     once "^1.4.0"
 
 "@octokit/request@^5.6.0":
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.2.tgz#1aa74d5da7b9e04ac60ef232edd9a7438dcf32d8"
-  integrity sha512-je66CvSEVf0jCpRISxkUcCa0UkxmFs6eGDRSbfJtAVwbLH5ceqF+YEyC8lj8ystKyZTy8adWr0qmkY52EfOeLA==
+  version "5.6.3"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.3.tgz#19a022515a5bba965ac06c9d1334514eb50c48b0"
+  integrity sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==
   dependencies:
     "@octokit/endpoint" "^6.0.1"
     "@octokit/request-error" "^2.1.0"
     "@octokit/types" "^6.16.1"
     is-plain-object "^5.0.0"
-    node-fetch "^2.6.1"
+    node-fetch "^2.6.7"
     universal-user-agent "^6.0.0"
 
 "@octokit/request@^6.0.0":
@@ -8542,85 +8526,100 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@rollup/rollup-android-arm-eabi@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.1.tgz#c3a7938551273a2b72820cf5d22e54cf41dc206e"
-  integrity sha512-2thheikVEuU7ZxFXubPDOtspKn1x0yqaYQwvALVtEcvFhMifPADBrgRPyHV0TF3b+9BgvgjgagVyvA/UqPZHmg==
-
-"@rollup/rollup-android-arm64@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.1.tgz#fa3693e4674027702c42fcbbb86bbd0c635fd3b9"
-  integrity sha512-t1lLYn4V9WgnIFHXy1d2Di/7gyzBWS8G5pQSXdZqfrdCGTwi1VasRMSS81DTYb+avDs/Zz4A6dzERki5oRYz1g==
-
-"@rollup/rollup-darwin-arm64@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.1.tgz#e19922f4ac1e4552a230ff8f49d5688c5c07d284"
-  integrity sha512-AH/wNWSEEHvs6t4iJ3RANxW5ZCK3fUnmf0gyMxWCesY1AlUj8jY7GC+rQE4wd3gwmZ9XDOpL0kcFnCjtN7FXlA==
-
-"@rollup/rollup-darwin-x64@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.1.tgz#897f8d47b115ea84692a29cf2366899499d4d915"
-  integrity sha512-dO0BIz/+5ZdkLZrVgQrDdW7m2RkrLwYTh2YMFG9IpBtlC1x1NPNSXkfczhZieOlOLEqgXOFH3wYHB7PmBtf+Bg==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.1.tgz#7d1e2a542f3a5744f5c24320067bd5af99ec9d62"
-  integrity sha512-sWWgdQ1fq+XKrlda8PsMCfut8caFwZBmhYeoehJ05FdI0YZXk6ZyUjWLrIgbR/VgiGycrFKMMgp7eJ69HOF2pQ==
-
-"@rollup/rollup-linux-arm-musleabihf@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.1.tgz#88bec1c9df85fc5e24d49f783e19934717dd69b5"
-  integrity sha512-9OIiSuj5EsYQlmwhmFRA0LRO0dRRjdCVZA3hnmZe1rEwRk11Jy3ECGGq3a7RrVEZ0/pCsYWx8jG3IvcrJ6RCew==
-
-"@rollup/rollup-linux-arm64-gnu@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.1.tgz#6dc60f0fe7bd49ed07a2d4d9eab15e671b3bd59d"
-  integrity sha512-0kuAkRK4MeIUbzQYu63NrJmfoUVicajoRAL1bpwdYIYRcs57iyIV9NLcuyDyDXE2GiZCL4uhKSYAnyWpjZkWow==
-
-"@rollup/rollup-linux-arm64-musl@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.1.tgz#a03b78775c129e8333aca9e1e420e8e217ee99b9"
-  integrity sha512-/6dYC9fZtfEY0vozpc5bx1RP4VrtEOhNQGb0HwvYNwXD1BBbwQ5cKIbUVVU7G2d5WRE90NfB922elN8ASXAJEA==
-
-"@rollup/rollup-linux-powerpc64le-gnu@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.1.tgz#ee3810647faf2c105a5a4e71260bb90b96bf87bc"
-  integrity sha512-ltUWy+sHeAh3YZ91NUsV4Xg3uBXAlscQe8ZOXRCVAKLsivGuJsrkawYPUEyCV3DYa9urgJugMLn8Z3Z/6CeyRQ==
-
-"@rollup/rollup-linux-riscv64-gnu@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.1.tgz#385d76a088c27db8054d9f3f28d64d89294f838e"
-  integrity sha512-BggMndzI7Tlv4/abrgLwa/dxNEMn2gC61DCLrTzw8LkpSKel4o+O+gtjbnkevZ18SKkeN3ihRGPuBxjaetWzWg==
-
-"@rollup/rollup-linux-s390x-gnu@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.1.tgz#daa2b62a6e6f737ebef6700a12a93c9764e18583"
-  integrity sha512-z/9rtlGd/OMv+gb1mNSjElasMf9yXusAxnRDrBaYB+eS1shFm6/4/xDH1SAISO5729fFKUkJ88TkGPRUh8WSAA==
-
-"@rollup/rollup-linux-x64-gnu@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.1.tgz#790ae96118cc892464e9f10da358c0c8a6b9acdd"
-  integrity sha512-kXQVcWqDcDKw0S2E0TmhlTLlUgAmMVqPrJZR+KpH/1ZaZhLSl23GZpQVmawBQGVhyP5WXIsIQ/zqbDBBYmxm5w==
-
-"@rollup/rollup-linux-x64-musl@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.1.tgz#d613147f7ac15fafe2a0b6249e8484e161ca2847"
-  integrity sha512-CbFv/WMQsSdl+bpX6rVbzR4kAjSSBuDgCqb1l4J68UYsQNalz5wOqLGYj4ZI0thGpyX5kc+LLZ9CL+kpqDovZA==
-
-"@rollup/rollup-win32-arm64-msvc@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.1.tgz#18349db8250559a5460d59eb3575f9781be4ab98"
-  integrity sha512-3Q3brDgA86gHXWHklrwdREKIrIbxC0ZgU8lwpj0eEKGBQH+31uPqr0P2v11pn0tSIxHvcdOWxa4j+YvLNx1i6g==
-
-"@rollup/rollup-win32-ia32-msvc@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.1.tgz#199648b68271f7ab9d023f5c077725d51d12d466"
-  integrity sha512-tNg+jJcKR3Uwe4L0/wY3Ro0H+u3nrb04+tcq1GSYzBEmKLeOQF2emk1whxlzNqb6MMrQ2JOcQEpuuiPLyRcSIw==
-
-"@rollup/rollup-win32-x64-msvc@4.21.1":
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.1.tgz#4d3ec02dbf280c20bfeac7e50cd5669b66f9108f"
-  integrity sha512-xGiIH95H1zU7naUyTKEyOA/I0aexNMUdO9qRv0bLKN3qu25bBdrxZHqA3PTJ24YNN/GdMzG4xkDcd/GvjuhfLg==
+"@rollup/rollup-android-arm-eabi@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.31.0.tgz#d4dd60da0075a6ce9a6c76d71b8204f3e1822285"
+  integrity sha512-9NrR4033uCbUBRgvLcBrJofa2KY9DzxL2UKZ1/4xA/mnTNyhZCWBuD8X3tPm1n4KxcgaraOYgrFKSgwjASfmlA==
+
+"@rollup/rollup-android-arm64@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.31.0.tgz#25c4d33259a7a2ccd2f52a5ffcc0bb3ab3f0729d"
+  integrity sha512-iBbODqT86YBFHajxxF8ebj2hwKm1k8PTBQSojSt3d1FFt1gN+xf4CowE47iN0vOSdnd+5ierMHBbu/rHc7nq5g==
+
+"@rollup/rollup-darwin-arm64@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz#d137dff254b19163a6b52ac083a71cd055dae844"
+  integrity sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==
+
+"@rollup/rollup-darwin-x64@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.31.0.tgz#58ff20b5dacb797d3adca19f02a21c532f9d55bf"
+  integrity sha512-hrWL7uQacTEF8gdrQAqcDy9xllQ0w0zuL1wk1HV8wKGSGbKPVjVUv/DEwT2+Asabf8Dh/As+IvfdU+H8hhzrQQ==
+
+"@rollup/rollup-freebsd-arm64@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz#96ce1a241c591ec3e068f4af765d94eddb24e60c"
+  integrity sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==
+
+"@rollup/rollup-freebsd-x64@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz#e59e7ede505be41f0b4311b0b943f8eb44938467"
+  integrity sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.31.0.tgz#e455ca6e4ff35bd46d62201c153352e717000a7b"
+  integrity sha512-0O8ViX+QcBd3ZmGlcFTnYXZKGbFu09EhgD27tgTdGnkcYXLat4KIsBBQeKLR2xZDCXdIBAlWLkiXE1+rJpCxFw==
+
+"@rollup/rollup-linux-arm-musleabihf@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.31.0.tgz#bc1a93d807d19e70b1e343a5bfea43723bcd6327"
+  integrity sha512-w5IzG0wTVv7B0/SwDnMYmbr2uERQp999q8FMkKG1I+j8hpPX2BYFjWe69xbhbP6J9h2gId/7ogesl9hwblFwwg==
+
+"@rollup/rollup-linux-arm64-gnu@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.31.0.tgz#f38bf843f1dc3d5de680caf31084008846e3efae"
+  integrity sha512-JyFFshbN5xwy6fulZ8B/8qOqENRmDdEkcIMF0Zz+RsfamEW+Zabl5jAb0IozP/8UKnJ7g2FtZZPEUIAlUSX8cA==
+
+"@rollup/rollup-linux-arm64-musl@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.31.0.tgz#b3987a96c18b7287129cf735be2dbf83e94d9d05"
+  integrity sha512-kpQXQ0UPFeMPmPYksiBL9WS/BDiQEjRGMfklVIsA0Sng347H8W2iexch+IEwaR7OVSKtr2ZFxggt11zVIlZ25g==
+
+"@rollup/rollup-linux-loongarch64-gnu@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.31.0.tgz#0f0324044e71c4f02e9f49e7ec4e347b655b34ee"
+  integrity sha512-pMlxLjt60iQTzt9iBb3jZphFIl55a70wexvo8p+vVFK+7ifTRookdoXX3bOsRdmfD+OKnMozKO6XM4zR0sHRrQ==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.31.0.tgz#809479f27f1fd5b4eecd2aa732132ad952d454ba"
+  integrity sha512-D7TXT7I/uKEuWiRkEFbed1UUYZwcJDU4vZQdPTcepK7ecPhzKOYk4Er2YR4uHKme4qDeIh6N3XrLfpuM7vzRWQ==
+
+"@rollup/rollup-linux-riscv64-gnu@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.31.0.tgz#7bc75c4f22db04d3c972f83431739cfa41c6a36e"
+  integrity sha512-wal2Tc8O5lMBtoePLBYRKj2CImUCJ4UNGJlLwspx7QApYny7K1cUYlzQ/4IGQBLmm+y0RS7dwc3TDO/pmcneTw==
+
+"@rollup/rollup-linux-s390x-gnu@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.31.0.tgz#cfe8052345c55864d83ae343362cf1912480170e"
+  integrity sha512-O1o5EUI0+RRMkK9wiTVpk2tyzXdXefHtRTIjBbmFREmNMy7pFeYXCFGbhKFwISA3UOExlo5GGUuuj3oMKdK6JQ==
+
+"@rollup/rollup-linux-x64-gnu@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.31.0.tgz#c6b048f1e25f3fea5b4bd246232f4d07a159c5a0"
+  integrity sha512-zSoHl356vKnNxwOWnLd60ixHNPRBglxpv2g7q0Cd3Pmr561gf0HiAcUBRL3S1vPqRC17Zo2CX/9cPkqTIiai1g==
+
+"@rollup/rollup-linux-x64-musl@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.31.0.tgz#615273ac52d1a201f4de191cbd3389016a9d7d80"
+  integrity sha512-ypB/HMtcSGhKUQNiFwqgdclWNRrAYDH8iMYH4etw/ZlGwiTVxBz2tDrGRrPlfZu6QjXwtd+C3Zib5pFqID97ZA==
+
+"@rollup/rollup-win32-arm64-msvc@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.31.0.tgz#32ed85810c1b831c648eca999d68f01255b30691"
+  integrity sha512-JuhN2xdI/m8Hr+aVO3vspO7OQfUFO6bKLIRTAy0U15vmWjnZDLrEgCZ2s6+scAYaQVpYSh9tZtRijApw9IXyMw==
+
+"@rollup/rollup-win32-ia32-msvc@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.31.0.tgz#d47effada68bcbfdccd30c4a788d42e4542ff4d3"
+  integrity sha512-U1xZZXYkvdf5MIWmftU8wrM5PPXzyaY1nGCI4KI4BFfoZxHamsIe+BtnPLIvvPykvQWlVbqUXdLa4aJUuilwLQ==
+
+"@rollup/rollup-win32-x64-msvc@4.31.0":
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.31.0.tgz#7a2d89a82cf0388d60304964217dd7beac6de645"
+  integrity sha512-ul8rnCsUumNln5YWwz0ted2ZHFhzhRRnkpBZ+YRuHoRAlUji9KChpOUOndY7uykrPEPXVbHLlsdo6v5yXo/TXw==
 
 "@schematics/angular@13.3.11":
   version "13.3.11"
@@ -9410,10 +9409,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/bytes@^3.1.0":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@types/bytes/-/bytes-3.1.1.tgz#67a876422e660dc4c10a27f3e5bcfbd5455f01d0"
-  integrity sha512-lOGyCnw+2JVPKU3wIV0srU0NyALwTBJlVSx5DfMQOFuuohA8y9S8orImpuIQikZ0uIQ8gehrRjxgQC1rLRi11w==
+"@types/bytes@^3.1.5":
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/@types/bytes/-/bytes-3.1.5.tgz#22fb92839f37bd5490e0dcd411999bb1c16ddaa0"
+  integrity sha512-VgZkrJckypj85YxEsEavcMmmSOIzkUHqWmM4CCyia5dc54YwsXzJ5uT4fYxBQNEXx+oF1krlhgCbvfubXqZYsQ==
 
 "@types/caseless@*":
   version "0.12.2"
@@ -9552,10 +9551,10 @@
     "@types/node" "*"
     aws-sdk "^2.819.0"
 
-"@types/decompress@^4.2.3":
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/@types/decompress/-/decompress-4.2.4.tgz#dd2715d3ac1f566d03e6e302d1a26ffab59f8c5c"
-  integrity sha512-/C8kTMRTNiNuWGl5nEyKbPiMv6HA+0RbEXzFhFBEzASM6+oa4tJro9b8nj7eRlOFfuLdzUU+DS/GPDlvvzMOhA==
+"@types/decompress@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@types/decompress/-/decompress-4.2.7.tgz#604f69b69d519ecb74dea1ea0829f159b85e1332"
+  integrity sha512-9z+8yjKr5Wn73Pt17/ldnmQToaFHZxK0N1GHysuk/JIPT8RIdQeoInM01wWPgypRcvb6VH1drjuFpQ4zmY437g==
   dependencies:
     "@types/node" "*"
 
@@ -9581,7 +9580,7 @@
     "@types/node" "*"
     "@types/ssh2" "*"
 
-"@types/eslint-scope@^3.7.3":
+"@types/eslint-scope@^3.7.3", "@types/eslint-scope@^3.7.7":
   version "3.7.7"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
   integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
@@ -9615,10 +9614,10 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
-"@types/estree@1.0.5", "@types/estree@^1.0.0":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
+"@types/estree@1.0.6", "@types/estree@^1.0.6":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
+  integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
 
 "@types/estree@^0.0.51":
   version "0.0.51"
@@ -9835,11 +9834,6 @@
   resolved "https://registry.yarnpkg.com/@types/lru-cache/-/lru-cache-5.1.1.tgz#c48c2e27b65d2a153b19bfc1a317e30872e01eef"
   integrity sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw==
 
-"@types/mime@*":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.4.tgz#2198ac274de6017b44d941e00261d5bc6a0e0a45"
-  integrity sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==
-
 "@types/mime@^1":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
@@ -9886,9 +9880,9 @@
     "@types/node" "*"
 
 "@types/node-fetch@^2.5.0", "@types/node-fetch@^2.5.7", "@types/node-fetch@^2.5.8":
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.11.tgz#9b39b78665dae0e82a08f02f4967d62c66f95d24"
-  integrity sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.12.tgz#8ab5c3ef8330f13100a7479e2cd56d3386830a03"
+  integrity sha512-8nneRWKCg3rMtF69nLQJnOYUcbafYeFSjqkw3jCRLsqkWFlHaoQrr5mXmofFGOx3DKn7UfmBMyov8ySvLRVldA==
   dependencies:
     "@types/node" "*"
     form-data "^4.0.0"
@@ -9900,7 +9894,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@^12", "@types/node@^18", "@types/node@^20.13.0":
+"@types/node@*", "@types/node@^18", "@types/node@^20.13.0":
   version "18.19.46"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.46.tgz#51801396c01153e0626e36f43386e83bc768b072"
   integrity sha512-vnRgMS7W6cKa1/0G3/DTtQYpVrZ8c0Xm6UkLaVFrb9jtcVC3okokW09Ki1Qdrj9ISokszD69nY4WDLRlvHlhAA==
@@ -10063,12 +10057,7 @@
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
   integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
 
-"@types/semver@^7.5.0":
-  version "7.5.6"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339"
-  integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==
-
-"@types/semver@^7.5.8":
+"@types/semver@^7.5.0", "@types/semver@^7.5.8":
   version "7.5.8"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
   integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
@@ -10088,22 +10077,14 @@
   dependencies:
     "@types/express" "*"
 
-"@types/serve-static@*":
-  version "1.13.10"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
-  integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
-  dependencies:
-    "@types/mime" "^1"
-    "@types/node" "*"
-
-"@types/serve-static@^1.13.10":
-  version "1.15.5"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.5.tgz#15e67500ec40789a1e8c9defc2d32a896f05b033"
-  integrity sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==
+"@types/serve-static@*", "@types/serve-static@^1.13.10":
+  version "1.15.7"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.7.tgz#22174bbd74fb97fe303109738e9b5c2f3064f714"
+  integrity sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==
   dependencies:
     "@types/http-errors" "*"
-    "@types/mime" "*"
     "@types/node" "*"
+    "@types/send" "*"
 
 "@types/shelljs@^0.8.5":
   version "0.8.11"
@@ -10254,17 +10235,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/ws@^8.2.2":
-  version "8.5.13"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.13.tgz#6414c280875e2691d0d1e080b05addbf5cb91e20"
-  integrity sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==
-  dependencies:
-    "@types/node" "*"
-
-"@types/ws@^8.5.5":
-  version "8.5.9"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.9.tgz#384c489f99c83225a53f01ebc3eddf3b8e202a8c"
-  integrity sha512-jbdrY0a8lxfdTp/+r7Z4CkycbOFN8WX+IOchLJr3juT/xzbJ8URyTVSJ/hvNdadTgM1mnedb47n+Y31GsFnQlg==
+"@types/ws@^8.2.2", "@types/ws@^8.5.5":
+  version "8.5.14"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.14.tgz#93d44b268c9127d96026cf44353725dd9b6c3c21"
+  integrity sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==
   dependencies:
     "@types/node" "*"
 
@@ -11015,43 +10989,43 @@
     "@webassemblyjs/helper-numbers" "1.11.1"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
 
-"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
-  integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
+"@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.14.1.tgz#a9f6a07f2b03c95c8d38c4536a1fdfb521ff55b6"
+  integrity sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==
   dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/helper-numbers" "1.13.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
 
 "@webassemblyjs/floating-point-hex-parser@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
   integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
 
-"@webassemblyjs/floating-point-hex-parser@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
-  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
+"@webassemblyjs/floating-point-hex-parser@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz#fcca1eeddb1cc4e7b6eed4fc7956d6813b21b9fb"
+  integrity sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==
 
 "@webassemblyjs/helper-api-error@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
   integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
 
-"@webassemblyjs/helper-api-error@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
-  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
+"@webassemblyjs/helper-api-error@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz#e0a16152248bc38daee76dd7e21f15c5ef3ab1e7"
+  integrity sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==
 
 "@webassemblyjs/helper-buffer@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
   integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
 
-"@webassemblyjs/helper-buffer@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093"
-  integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==
+"@webassemblyjs/helper-buffer@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz#822a9bc603166531f7d5df84e67b5bf99b72b96b"
+  integrity sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==
 
 "@webassemblyjs/helper-numbers@1.11.1":
   version "1.11.1"
@@ -11062,13 +11036,13 @@
     "@webassemblyjs/helper-api-error" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/helper-numbers@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
-  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
+"@webassemblyjs/helper-numbers@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz#dbd932548e7119f4b8a7877fd5a8d20e63490b2d"
+  integrity sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==
   dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
-    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@webassemblyjs/floating-point-hex-parser" "1.13.2"
+    "@webassemblyjs/helper-api-error" "1.13.2"
     "@xtuc/long" "4.2.2"
 
 "@webassemblyjs/helper-wasm-bytecode@1.11.1":
@@ -11076,10 +11050,10 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
   integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
 
-"@webassemblyjs/helper-wasm-bytecode@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
-  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
+"@webassemblyjs/helper-wasm-bytecode@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz#e556108758f448aae84c850e593ce18a0eb31e0b"
+  integrity sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==
 
 "@webassemblyjs/helper-wasm-section@1.11.1":
   version "1.11.1"
@@ -11091,15 +11065,15 @@
     "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
     "@webassemblyjs/wasm-gen" "1.11.1"
 
-"@webassemblyjs/helper-wasm-section@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577"
-  integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==
+"@webassemblyjs/helper-wasm-section@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz#9629dda9c4430eab54b591053d6dc6f3ba050348"
+  integrity sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-buffer" "1.14.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/wasm-gen" "1.14.1"
 
 "@webassemblyjs/ieee754@1.11.1":
   version "1.11.1"
@@ -11108,10 +11082,10 @@
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/ieee754@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
-  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
+"@webassemblyjs/ieee754@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz#1c5eaace1d606ada2c7fd7045ea9356c59ee0dba"
+  integrity sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
@@ -11122,10 +11096,10 @@
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/leb128@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
-  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
+"@webassemblyjs/leb128@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.13.2.tgz#57c5c3deb0105d02ce25fa3fd74f4ebc9fd0bbb0"
+  integrity sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
@@ -11134,10 +11108,10 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
   integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
 
-"@webassemblyjs/utf8@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
-  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
+"@webassemblyjs/utf8@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.13.2.tgz#917a20e93f71ad5602966c2d685ae0c6c21f60f1"
+  integrity sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==
 
 "@webassemblyjs/wasm-edit@1.11.1":
   version "1.11.1"
@@ -11153,19 +11127,19 @@
     "@webassemblyjs/wasm-parser" "1.11.1"
     "@webassemblyjs/wast-printer" "1.11.1"
 
-"@webassemblyjs/wasm-edit@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab"
-  integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/helper-wasm-section" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-    "@webassemblyjs/wasm-opt" "1.11.6"
-    "@webassemblyjs/wasm-parser" "1.11.6"
-    "@webassemblyjs/wast-printer" "1.11.6"
+"@webassemblyjs/wasm-edit@^1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz#ac6689f502219b59198ddec42dcd496b1004d597"
+  integrity sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-buffer" "1.14.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/helper-wasm-section" "1.14.1"
+    "@webassemblyjs/wasm-gen" "1.14.1"
+    "@webassemblyjs/wasm-opt" "1.14.1"
+    "@webassemblyjs/wasm-parser" "1.14.1"
+    "@webassemblyjs/wast-printer" "1.14.1"
 
 "@webassemblyjs/wasm-gen@1.11.1":
   version "1.11.1"
@@ -11178,16 +11152,16 @@
     "@webassemblyjs/leb128" "1.11.1"
     "@webassemblyjs/utf8" "1.11.1"
 
-"@webassemblyjs/wasm-gen@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268"
-  integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==
+"@webassemblyjs/wasm-gen@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz#991e7f0c090cb0bb62bbac882076e3d219da9570"
+  integrity sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/ieee754" "1.13.2"
+    "@webassemblyjs/leb128" "1.13.2"
+    "@webassemblyjs/utf8" "1.13.2"
 
 "@webassemblyjs/wasm-opt@1.11.1":
   version "1.11.1"
@@ -11199,15 +11173,15 @@
     "@webassemblyjs/wasm-gen" "1.11.1"
     "@webassemblyjs/wasm-parser" "1.11.1"
 
-"@webassemblyjs/wasm-opt@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2"
-  integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==
+"@webassemblyjs/wasm-opt@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz#e6f71ed7ccae46781c206017d3c14c50efa8106b"
+  integrity sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-    "@webassemblyjs/wasm-parser" "1.11.6"
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-buffer" "1.14.1"
+    "@webassemblyjs/wasm-gen" "1.14.1"
+    "@webassemblyjs/wasm-parser" "1.14.1"
 
 "@webassemblyjs/wasm-parser@1.11.1":
   version "1.11.1"
@@ -11221,17 +11195,17 @@
     "@webassemblyjs/leb128" "1.11.1"
     "@webassemblyjs/utf8" "1.11.1"
 
-"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1"
-  integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
+"@webassemblyjs/wasm-parser@1.14.1", "@webassemblyjs/wasm-parser@^1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz#b3e13f1893605ca78b52c68e54cf6a865f90b9fb"
+  integrity sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-api-error" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-api-error" "1.13.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/ieee754" "1.13.2"
+    "@webassemblyjs/leb128" "1.13.2"
+    "@webassemblyjs/utf8" "1.13.2"
 
 "@webassemblyjs/wast-printer@1.11.1":
   version "1.11.1"
@@ -11241,12 +11215,12 @@
     "@webassemblyjs/ast" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/wast-printer@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20"
-  integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==
+"@webassemblyjs/wast-printer@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz#3bb3e9638a8ae5fdaf9610e7a06b4d9f9aa6fe07"
+  integrity sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/ast" "1.14.1"
     "@xtuc/long" "4.2.2"
 
 "@wry/caches@^1.0.0":
@@ -11284,6 +11258,11 @@
   dependencies:
     tslib "^2.3.0"
 
+"@xmldom/xmldom@^0.8.8":
+  version "0.8.10"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99"
+  integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -11365,11 +11344,6 @@ acorn-import-assertions@^1.7.6:
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
   integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
 
-acorn-import-assertions@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
-  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
-
 acorn-jsx@^5.2.0, acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
@@ -11404,16 +11378,16 @@ acorn@^8.0.4, acorn@^8.0.5, acorn@^8.10.0, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
   integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
 
+acorn@^8.14.0, acorn@^8.5.0:
+  version "8.14.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
+  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
+
 acorn@^8.2.4:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"
   integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==
 
-acorn@^8.5.0:
-  version "8.14.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
-  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
-
 add-dom-event-listener@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310"
@@ -11458,6 +11432,11 @@ agent-base@^7.0.2, agent-base@^7.1.0:
   dependencies:
     debug "^4.3.4"
 
+agent-base@^7.1.2:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.3.tgz#29435eb821bc4194633a5b89e5bc4703bafc25a1"
+  integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==
+
 agentkeepalive@^4.1.3:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b"
@@ -11590,12 +11569,12 @@ ansi-html-community@^0.0.8:
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
 
 ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
+  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
 
 ansi-regex@^4.1.0:
   version "4.1.1"
@@ -11608,9 +11587,9 @@ ansi-regex@^5.0.1:
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-regex@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
-  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654"
+  integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
@@ -11722,9 +11701,9 @@ anymatch@^3.0.3, anymatch@~3.1.2:
     picomatch "^2.0.4"
 
 apache-arrow@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/apache-arrow/-/apache-arrow-19.0.0.tgz#631f1104f0504959987e25c9b4f425a61c985a48"
-  integrity sha512-xifuq9x7tYriK64p7xwtpe9JFBxiQxs0OXBnKv36OwQmkjpNhZN7aKXFa0mV5vaOxf0uKHmjlnxUNw/2fl5FRw==
+  version "19.0.1"
+  resolved "https://registry.yarnpkg.com/apache-arrow/-/apache-arrow-19.0.1.tgz#aeac6922102e3274f57d97ec72da69d20e55b15c"
+  integrity sha512-APmMLzS4qbTivLrPdQXexGM4JRr+0g62QDaobzEvip/FdQIrv2qLy0mD5Qdmw4buydtVJgbFeKR8f59I6PPGDg==
   dependencies:
     "@swc/helpers" "^0.5.11"
     "@types/command-line-args" "^5.2.3"
@@ -11971,7 +11950,7 @@ asn1.js@^5.0.0, asn1.js@^5.3.0, asn1.js@^5.4.1:
     minimalistic-assert "^1.0.0"
     safer-buffer "^2.1.0"
 
-asn1@^0.2.4, asn1@~0.2.3:
+asn1@^0.2.6, asn1@~0.2.3:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
   integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
@@ -12040,36 +12019,19 @@ async-validator@~1.11.3:
 async@^0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
-  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
+  integrity sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==
 
-async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
-  dependencies:
-    lodash "^4.17.14"
-
-async@^2.6.4:
+async@^2.6.2, async@^2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
   integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
   dependencies:
     lodash "^4.17.14"
 
-async@^3.1.0, async@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz#2eb7671034bb2194d45d30e31e24ec7e7f9670cd"
-  integrity sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==
-
-async@^3.2.3:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
-  integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
-
-async@^3.2.4, async@^3.2.5:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
-  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
+async@^3.1.0, async@^3.2.0, async@^3.2.3, async@^3.2.4, async@^3.2.5:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
+  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -12123,19 +12085,20 @@ available-typed-arrays@^1.0.7:
     possible-typed-array-names "^1.0.0"
 
 aws-sdk@^2.787.0, aws-sdk@^2.819.0:
-  version "2.1046.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1046.0.tgz#9147b0fa1c86acbebd1a061e951ab5012f4499d7"
-  integrity sha512-ocwHclMXdIA+NWocUyvp9Ild3/zy2vr5mHp3mTyodf0WU5lzBE8PocCVLSWhMAXLxyia83xv2y5f5AzAcetbqA==
+  version "2.1692.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1692.0.tgz#9dac5f7bfcc5ab45825cc8591b12753aa7d2902c"
+  integrity sha512-x511uiJ/57FIsbgUe5csJ13k3uzu25uWQE+XqfBis/sB0SFoiElJWXRkgEAUh0U6n40eT3ay5Ue4oPkRMu1LYw==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
     ieee754 "1.1.13"
-    jmespath "0.15.0"
+    jmespath "0.16.0"
     querystring "0.2.0"
     sax "1.2.1"
     url "0.10.3"
-    uuid "3.3.2"
-    xml2js "0.4.19"
+    util "^0.12.4"
+    uuid "8.0.0"
+    xml2js "0.6.2"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -12157,23 +12120,16 @@ axe-core@^4.3.5:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.5.tgz#78d6911ba317a8262bfee292aeafcc1e04b49cc5"
   integrity sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==
 
-axios@^0.21.1:
-  version "0.21.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
-  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
-  dependencies:
-    follow-redirects "^1.14.0"
-
-axios@^1.6.8:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f"
-  integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==
+axios@^0.28.0:
+  version "0.28.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.28.1.tgz#2a7bcd34a3837b71ee1a5ca3762214b86b703e70"
+  integrity sha512-iUcGA5a7p0mVb4Gm/sy+FSECNkPFT4y7wt6OM/CDpO/OnNCvSs3PoMG8ibrC9jRoGYU0gUK5pXVC4NPXq6lHRQ==
   dependencies:
-    follow-redirects "^1.15.6"
+    follow-redirects "^1.15.0"
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
-axios@^1.7.4, axios@^1.7.7:
+axios@^1.6.8, axios@^1.7.4:
   version "1.7.9"
   resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.9.tgz#d7d071380c132a24accda1b2cfc1535b79ec650a"
   integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==
@@ -12182,6 +12138,15 @@ axios@^1.7.4, axios@^1.7.7:
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
+axios@^1.7.7:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.1.tgz#7c118d2146e9ebac512b7d1128771cdd738d11e3"
+  integrity sha512-NN+fvwH/kV01dYUQ3PTOZns4LWtWhOFCAhQ/pHb88WQ1hNe5V/dvFwc4VJcDL11LT9xSX0QtsR8sWUuyOuOq7g==
+  dependencies:
+    follow-redirects "^1.15.6"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 axobject-query@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
@@ -12809,10 +12774,10 @@ buffer@^6.0.3:
     base64-js "^1.3.1"
     ieee754 "^1.2.1"
 
-buildcheck@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.3.tgz#70451897a95d80f7807e68fc412eb2e7e35ff4d5"
-  integrity sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==
+buildcheck@~0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.6.tgz#89aa6e417cfd1e2196e3f8fe915eb709d2fe4238"
+  integrity sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==
 
 builtin-modules@^3.1.0:
   version "3.2.0"
@@ -12844,7 +12809,7 @@ bytes@3.1.1, bytes@^3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a"
   integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==
 
-bytes@3.1.2:
+bytes@3.1.2, bytes@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
@@ -12943,6 +12908,14 @@ cachedir@^2.3.0:
   resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"
   integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==
 
+call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz#32e5892e6361b29b0b545ba6f7763378daca2840"
+  integrity sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==
+  dependencies:
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -12972,6 +12945,24 @@ call-bind@^1.0.6, call-bind@^1.0.7:
     get-intrinsic "^1.2.4"
     set-function-length "^1.2.1"
 
+call-bind@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
+  integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
+  dependencies:
+    call-bind-apply-helpers "^1.0.0"
+    es-define-property "^1.0.0"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.2"
+
+call-bound@^1.0.2, call-bound@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.3.tgz#41cfd032b593e39176a71533ab4f384aa04fd681"
+  integrity sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==
+  dependencies:
+    call-bind-apply-helpers "^1.0.1"
+    get-intrinsic "^1.2.6"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -13878,9 +13869,9 @@ cookie@~0.4.1:
   integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
 
 cookiejar@^2.1.0:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc"
-  integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b"
+  integrity sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==
 
 copy-anything@^2.0.1:
   version "2.0.3"
@@ -14020,13 +14011,13 @@ cosmiconfig@^7.0.0, cosmiconfig@^7.0.1:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-cpu-features@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.4.tgz#0023475bb4f4c525869c162e4108099e35bf19d8"
-  integrity sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==
+cpu-features@~0.0.10:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.10.tgz#9aae536db2710c7254d7ed67cb3cbc7d29ad79c5"
+  integrity sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==
   dependencies:
-    buildcheck "0.0.3"
-    nan "^2.15.0"
+    buildcheck "~0.0.6"
+    nan "^2.19.0"
 
 crc-32@^1.2.0:
   version "1.2.0"
@@ -14094,16 +14085,16 @@ cross-fetch@^3.0.2:
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
+  integrity sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
     which "^1.2.9"
 
 cross-spawn@^6.0.0, cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57"
+  integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -14112,9 +14103,9 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     which "^1.2.9"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -14631,13 +14622,13 @@ d3-timer@^3.0.1:
   resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-3.0.1.tgz#6284d2a2708285b1abb7e201eda4380af35e63b0"
   integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==
 
-d@1, d@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
-  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
+d@1, d@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.2.tgz#2aefd554b81981e7dccf72d6842ae725cb17e5de"
+  integrity sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==
   dependencies:
-    es5-ext "^0.10.50"
-    type "^1.0.1"
+    es5-ext "^0.10.64"
+    type "^2.7.2"
 
 damerau-levenshtein@^1.0.7:
   version "1.0.7"
@@ -14759,12 +14750,12 @@ debug@2.6.9, debug@^2.2.0, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.5, debug@^4.3.6:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
+  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
   dependencies:
-    ms "2.1.2"
+    ms "^2.1.3"
 
 debug@4.3.3:
   version "4.3.3"
@@ -14780,20 +14771,6 @@ debug@^3.1.0, debug@^3.1.1, debug@^3.2.6, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.3.5:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
-  integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
-  dependencies:
-    ms "2.1.2"
-
-debug@^4.3.6:
-  version "4.3.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
-  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
-  dependencies:
-    ms "^2.1.3"
-
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -14837,9 +14814,9 @@ decimal.js@^10.4.3:
   integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 decompress-response@^6.0.0:
   version "6.0.0"
@@ -15336,6 +15313,15 @@ duckdb@^1.1.3:
     node-addon-api "^7.0.0"
     node-gyp "^9.3.0"
 
+dunder-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
+  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
+  dependencies:
+    call-bind-apply-helpers "^1.0.1"
+    es-errors "^1.3.0"
+    gopd "^1.2.0"
+
 duplexer@^0.1.1, duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -15447,9 +15433,9 @@ electron-to-chromium@^1.5.73:
   integrity sha512-nYOxJNxQ9Om4EC88BE4pPoNI8xwSFf8pU/BAeOl4Hh/b/i6V4biTAzwV7pXi3ARKeoYO5JZKMIXTryXSVer5RA==
 
 elliptic@^6.5.4:
-  version "6.5.7"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.7.tgz#8ec4da2cb2939926a1b9a73619d768207e647c8b"
-  integrity sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.1.tgz#3b8ffb02670bf69e382c7f65bf524c97c5405c06"
+  integrity sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==
   dependencies:
     bn.js "^4.11.9"
     brorand "^1.1.0"
@@ -15519,9 +15505,9 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
     once "^1.4.0"
 
 engine.io-client@~3.5.0:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.2.tgz#0ef473621294004e9ceebe73cef0af9e36f2f5fa"
-  integrity sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.4.tgz#5b40d7381772ba05c0881be5735a318424a07fc6"
+  integrity sha512-ydc8uuMMDxC5KCKNJN3zZKYJk2sgyTuTZQ7Aj1DJSsLKAcizA/PzWivw8fZMIjJVBo2CJOYzntv4FSjY/Lr//g==
   dependencies:
     component-emitter "~1.3.0"
     component-inherit "0.0.3"
@@ -15531,7 +15517,7 @@ engine.io-client@~3.5.0:
     indexof "0.0.1"
     parseqs "0.0.6"
     parseuri "0.0.6"
-    ws "~7.4.2"
+    ws "~7.5.10"
     xmlhttprequest-ssl "~1.6.2"
     yeast "0.1.2"
 
@@ -15546,17 +15532,17 @@ engine.io-parser@~2.2.0:
     blob "0.0.5"
     has-binary2 "~1.0.2"
 
-engine.io@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b"
-  integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==
+engine.io@~3.6.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.6.2.tgz#b5d0fffafdd8525dbcd10b3ab5d8337271c3c36b"
+  integrity sha512-C4JjGQZLY3kWlIDx0BQNKizbrfpb7NahxDztGdN5jrPK2ghmXiNDN+E/t0JzDeNRZxPVaszxEng42Pmj27X/0w==
   dependencies:
     accepts "~1.3.4"
     base64id "2.0.0"
     cookie "~0.4.1"
     debug "~4.1.0"
     engine.io-parser "~2.2.0"
-    ws "~7.4.2"
+    ws "~7.5.10"
 
 enhanced-resolve@^5.10.0:
   version "5.17.1"
@@ -15566,10 +15552,10 @@ enhanced-resolve@^5.10.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enhanced-resolve@^5.15.0:
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
-  integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
+enhanced-resolve@^5.17.1:
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz#91eb1db193896b9801251eeff1c6980278b1e404"
+  integrity sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -15789,12 +15775,10 @@ es-aggregate-error@^1.0.9:
     has-property-descriptors "^1.0.1"
     set-function-name "^2.0.1"
 
-es-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
-  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
-  dependencies:
-    get-intrinsic "^1.2.4"
+es-define-property@^1.0.0, es-define-property@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
+  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
 
 es-errors@^1.1.0, es-errors@^1.2.1, es-errors@^1.3.0:
   version "1.3.0"
@@ -15836,7 +15820,7 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es5-ext@0.10.53, es5-ext@^0.10.35, es5-ext@^0.10.50:
+es5-ext@0.10.53, es5-ext@^0.10.35, es5-ext@^0.10.64:
   version "0.10.53"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
   integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
@@ -15848,19 +15832,19 @@ es5-ext@0.10.53, es5-ext@^0.10.35, es5-ext@^0.10.50:
 es6-iterator@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
+  integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==
   dependencies:
     d "1"
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
 es6-symbol@^3.1.0, es6-symbol@^3.1.1, es6-symbol@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
-  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.4.tgz#f4e7d28013770b4208ecbf3e0bf14d3bcb557b8c"
+  integrity sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==
   dependencies:
-    d "^1.0.1"
-    ext "^1.1.2"
+    d "^1.0.2"
+    ext "^1.7.0"
 
 esbuild-android-64@0.14.54:
   version "0.14.54"
@@ -16246,14 +16230,6 @@ eslint-plugin-cypress@^2.12.1:
   dependencies:
     globals "^11.12.0"
 
-eslint-plugin-es@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz#12acae0f4953e76ba444bfd1b2271081ac620998"
-  integrity sha512-5fa/gR2yR3NxQf+UXkeLeP8FBBl6tSgdrAz1+cF84v1FMM4twGwQoqTnn+QxFLcPOrF4pdKEJKDB/q9GoyJrCA==
-  dependencies:
-    eslint-utils "^1.4.2"
-    regexpp "^2.0.1"
-
 eslint-plugin-es@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz#0f5f5da5f18aa21989feebe8a73eadefb3432976"
@@ -16311,28 +16287,6 @@ eslint-plugin-node@^10.0.0:
     resolve "^1.10.1"
     semver "^6.1.0"
 
-eslint-plugin-node@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-5.2.1.tgz#80df3253c4d7901045ec87fa660a284e32bdca29"
-  integrity sha512-xhPXrh0Vl/b7870uEbaumb2Q+LxaEcOQ3kS1jtIXanBAwpMre1l5q/l2l/hESYJGEFKuI78bp6Uw50hlpr7B+g==
-  dependencies:
-    ignore "^3.3.6"
-    minimatch "^3.0.4"
-    resolve "^1.3.3"
-    semver "5.3.0"
-
-eslint-plugin-node@^9.2.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-9.2.0.tgz#b1911f111002d366c5954a6d96d3cd5bf2a3036a"
-  integrity sha512-2abNmzAH/JpxI4gEOwd6K8wZIodK3BmHbTxz4s79OIYwwIt2gkpEXlAouJXu4H1c9ySTnRso0tsuthSOZbUMlA==
-  dependencies:
-    eslint-plugin-es "^1.4.1"
-    eslint-utils "^1.4.2"
-    ignore "^5.1.1"
-    minimatch "^3.0.4"
-    resolve "^1.10.1"
-    semver "^6.1.0"
-
 eslint-plugin-react@^7.15.1, eslint-plugin-react@^7.20.0:
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.27.1.tgz#469202442506616f77a854d91babaae1ec174b45"
@@ -16782,9 +16736,9 @@ express-graphql@^0.12.0:
     raw-body "^2.4.1"
 
 express@^4.17.1, express@^4.17.3, express@^4.21.1:
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.21.1.tgz#9dae5dda832f16b4eec941a4e44aa89ec481b281"
-  integrity sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
+  integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
@@ -16805,7 +16759,7 @@ express@^4.17.1, express@^4.17.3, express@^4.21.1:
     methods "~1.1.2"
     on-finished "2.4.1"
     parseurl "~1.3.3"
-    path-to-regexp "0.1.10"
+    path-to-regexp "0.1.12"
     proxy-addr "~2.0.7"
     qs "6.13.0"
     range-parser "~1.2.1"
@@ -16818,12 +16772,12 @@ express@^4.17.1, express@^4.17.3, express@^4.21.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-ext@^1.1.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/ext/-/ext-1.6.0.tgz#3871d50641e874cc172e2b53f919842d19db4c52"
-  integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==
+ext@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
+  integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==
   dependencies:
-    type "^2.5.0"
+    type "^2.7.2"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
@@ -17195,12 +17149,7 @@ focus-lock@^1.3.5:
   dependencies:
     tslib "^2.0.3"
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
-
-follow-redirects@^1.15.6:
+follow-redirects@^1.0.0, follow-redirects@^1.15.0, follow-redirects@^1.15.6:
   version "1.15.9"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
   integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
@@ -17529,6 +17478,22 @@ get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@
     has-symbols "^1.0.3"
     hasown "^2.0.0"
 
+get-intrinsic@^1.2.6:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.7.tgz#dcfcb33d3272e15f445d15124bc0a216189b9044"
+  integrity sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==
+  dependencies:
+    call-bind-apply-helpers "^1.0.1"
+    es-define-property "^1.0.1"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    function-bind "^1.1.2"
+    get-proto "^1.0.0"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
+    math-intrinsics "^1.1.0"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -17549,6 +17514,14 @@ get-port@5.1.1, get-port@^5.1.1:
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
   integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
 
+get-proto@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
+  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
+  dependencies:
+    dunder-proto "^1.0.1"
+    es-object-atoms "^1.0.0"
+
 get-stdin@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
@@ -17869,7 +17842,12 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@4.2.11, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+gopd@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
+  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
+
+graceful-fs@4.2.11, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -18049,6 +18027,11 @@ has-symbols@^1.0.3:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
+has-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
+  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
+
 has-tostringtag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
@@ -18394,6 +18377,14 @@ http-proxy-agent@^7.0.0:
     agent-base "^7.1.0"
     debug "^4.3.4"
 
+http-proxy-agent@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
 http-proxy-middleware@^2.0.0, http-proxy-middleware@^2.0.3:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6"
@@ -18468,6 +18459,14 @@ https-proxy-agent@^7.0.1:
     agent-base "^7.0.2"
     debug "4"
 
+https-proxy-agent@^7.0.6:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
+  integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==
+  dependencies:
+    agent-base "^7.1.2"
+    debug "4"
+
 human-signals@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
@@ -18564,11 +18563,6 @@ ignore-walk@^6.0.4:
   dependencies:
     minimatch "^9.0.0"
 
-ignore@^3.3.6:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
-
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -18820,9 +18814,9 @@ intl-messageformat@^10.1.0:
     tslib "^2.4.0"
 
 ioredis@^5.4.1:
-  version "5.4.2"
-  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.4.2.tgz#ebb6f1a10b825b2c0fb114763d7e82114a0bee6c"
-  integrity sha512-0SZXGNGZ+WzISQ67QDyZ2x0+wVxjjUndtD8oSeik/4ajifeiRufed8fCb8QW8VMyi4MXcS+UO1k/0NGhvq1PAg==
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.5.0.tgz#ff2332e125ca2ac8e15472ddd14ecdffa6484a2a"
+  integrity sha512-7CutT89g23FfSa8MDoIFs2GYYa0PaNiW/OrT+nRyjRXHDZd17HmIgy+reOQ/yhh72NznNjGuS8kbCAcA4Ro4mw==
   dependencies:
     "@ioredis/commands" "^1.1.1"
     cluster-key-slot "^1.1.0"
@@ -19025,6 +19019,16 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
+is-generator-function@^1.0.7:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.0.tgz#bf3eeda931201394f57b5dba2800f91a238309ca"
+  integrity sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==
+  dependencies:
+    call-bound "^1.0.3"
+    get-proto "^1.0.0"
+    has-tostringtag "^1.0.2"
+    safe-regex-test "^1.1.0"
+
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
@@ -19154,6 +19158,16 @@ is-regex@^1.0.4, is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-regex@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22"
+  integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==
+  dependencies:
+    call-bound "^1.0.2"
+    gopd "^1.2.0"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.2"
+
 is-resolvable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
@@ -19226,6 +19240,13 @@ is-typed-array@^1.1.13:
   dependencies:
     which-typed-array "^1.1.14"
 
+is-typed-array@^1.1.3:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b"
+  integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==
+  dependencies:
+    which-typed-array "^1.1.16"
+
 is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -19953,7 +19974,7 @@ jest-worker@^28.0.2:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@27, jest@^27, jest@^27.1.0, jest@^27.5.1:
+jest@^27, jest@^27.1.0:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc"
   integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==
@@ -19974,10 +19995,10 @@ jimp@^0.10.3:
     core-js "^3.4.1"
     regenerator-runtime "^0.13.3"
 
-jmespath@0.15.0:
-  version "0.15.0"
-  resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
-  integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=
+jmespath@0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076"
+  integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==
 
 joi@^17.4.0:
   version "17.11.0"
@@ -20241,20 +20262,13 @@ json2mq@^0.2.0:
     string-convert "^0.2.0"
 
 json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
-  dependencies:
-    minimist "^1.2.5"
-
-json5@^2.2.2, json5@^2.2.3:
+json5@^2.1.2, json5@^2.2.2, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -20756,18 +20770,18 @@ loader-utils@3.2.1:
   integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==
 
 loader-utils@^1.0.2, loader-utils@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
-  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
     json5 "^1.0.1"
 
 loader-utils@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
-  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
+  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -21230,9 +21244,9 @@ map-obj@^4.0.0:
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
 markdown-it@^12.2.0:
-  version "12.3.0"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.0.tgz#11490c61b412b8f41530319c005ecdcd4367171f"
-  integrity sha512-T345UZZ6ejQWTjG6PSEHplzNy5m4kF6zvUpHVDv8Snl/pEU0OxIK0jGg8YLVNwJvT8E0YJC7/2UvssJDk/wQCQ==
+  version "12.3.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
+  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
   dependencies:
     argparse "^2.0.1"
     entities "~2.1.0"
@@ -21247,6 +21261,11 @@ matchmediaquery@^0.3.0:
   dependencies:
     css-mediaquery "^0.1.2"
 
+math-intrinsics@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
+  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
+
 mdn-data@2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
@@ -21357,15 +21376,7 @@ methods@^1.1.1, methods@^1.1.2, methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
-  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
-  dependencies:
-    braces "^3.0.3"
-    picomatch "^2.3.1"
-
-micromatch@^4.0.8:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5, micromatch@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -21485,21 +21496,14 @@ minimatch@9.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@9.0.3, minimatch@^9.0.1:
+minimatch@9.0.3:
   version "9.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
   integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^3.0.4, minimatch@~3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^3.0.5, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -21520,13 +21524,20 @@ minimatch@^8.0.2:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^9.0.0, minimatch@^9.0.4:
+minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.4:
   version "9.0.5"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
   integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@~3.0.4:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1"
+  integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimist-options@4.1.0, minimist-options@^4.0.2:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -21713,24 +21724,17 @@ module-alias@^2.2.2:
   resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.3.tgz#ec2e85c68973bda6ab71ce7c93b763ec96053221"
   integrity sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==
 
-moment-range@*, moment-range@^4.0.1:
+moment-range@*, moment-range@^4.0.1, moment-range@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/moment-range/-/moment-range-4.0.2.tgz#f7c3863df2a1ed7fd1822ba5a7bcf53a78701be9"
   integrity sha512-n8sceWwSTjmz++nFHzeNEUsYtDqjgXgcOBzsHi+BoXQU2FW+eU92LUaK8gqOiSu5PG57Q9sYj1Fz4LRDj4FtKA==
   dependencies:
     es6-symbol "^3.1.0"
 
-moment-timezone@^0.5.15, moment-timezone@^0.5.33:
-  version "0.5.45"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c"
-  integrity sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==
-  dependencies:
-    moment "^2.29.4"
-
-moment-timezone@^0.5.46:
-  version "0.5.46"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.46.tgz#a21aa6392b3c6b3ed916cd5e95858a28d893704a"
-  integrity sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==
+moment-timezone@^0.5.15, moment-timezone@^0.5.33, moment-timezone@^0.5.46, moment-timezone@^0.5.47:
+  version "0.5.47"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.47.tgz#d4d1a21b78372d914d6d69ae285454732a429749"
+  integrity sha512-UbNt/JAWS0m/NJOebR0QMRHBk0hu03r5dx9GK8Cs0AS3I81yDcOc9k+DytPItgVvBP7J6Mf6U2n3BPAacAV9oA==
   dependencies:
     moment "^2.29.4"
 
@@ -21760,9 +21764,9 @@ ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 mssql@^10.0.2:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/mssql/-/mssql-10.0.2.tgz#99f9113a05b8ee32c84704fddc3780554cd89a60"
-  integrity sha512-GrQ6gzv2xA7ndOvONyZ++4RZsNkr8qDiIpvuFn2pR3TPiSk/cKdmvOrDU3jWgon7EPj7CPgmDiMh7Hgtft2xLg==
+  version "10.0.4"
+  resolved "https://registry.yarnpkg.com/mssql/-/mssql-10.0.4.tgz#030a96651748a192d7592851b67d176225cf1ac2"
+  integrity sha512-MhX5IcJ75/q+dUiOe+1ajpqjEe96ZKqMchYYPUIDU+Btqhwt4gbFeZhcGUZaRCEMV9uF+G8kLvaNSFaEzL9OXQ==
   dependencies:
     "@tediousjs/connection-string" "^0.5.0"
     commander "^11.0.0"
@@ -21854,35 +21858,20 @@ named-placeholders@^1.1.3:
   dependencies:
     lru-cache "^7.14.1"
 
-nan@^2.15.0:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
-  integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
-
-nan@^2.16.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916"
-  integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==
-
-nan@^2.18.0:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554"
-  integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==
+nan@^2.18.0, nan@^2.19.0, nan@^2.20.0:
+  version "2.22.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.0.tgz#31bc433fc33213c97bad36404bb68063de604de3"
+  integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==
 
-nanoid@^3.1.30:
+nanoid@^3.1.30, nanoid@^3.3.7, nanoid@^3.3.8:
   version "3.3.8"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
   integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
-nanoid@^3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
-
-napi-build-utils@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
-  integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
+napi-build-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-2.0.0.tgz#13c22c0187fcfccce1461844136372a47ddc027e"
+  integrity sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==
 
 native-duplexpair@^1.0.0:
   version "1.0.0"
@@ -21941,7 +21930,7 @@ neo-async@^2.6.0, neo-async@^2.6.2:
 next-tick@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
-  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
+  integrity sha512-mc/caHeUcdjnC/boPWJefDr4KUIWQNv+tlnFnJd38QMou86QtxQzBJfxgGRzvx8jazYRqrVlaHarfO72uNxPOg==
 
 nexus@^1.1.0:
   version "1.1.0"
@@ -23183,10 +23172,10 @@ path-scurry@^1.11.1, path-scurry@^1.6.1:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
-path-to-regexp@0.1.10:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b"
-  integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==
+path-to-regexp@0.1.12:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
+  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
 
 path-to-regexp@^1.7.0:
   version "1.9.0"
@@ -23510,12 +23499,13 @@ please-upgrade-node@^3.2.0:
     semver-compare "^1.0.0"
 
 plist@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe"
-  integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9"
+  integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==
   dependencies:
+    "@xmldom/xmldom" "^0.8.8"
     base64-js "^1.5.1"
-    xmlbuilder "^9.0.7"
+    xmlbuilder "^15.1.1"
 
 plur@^4.0.0:
   version "4.0.0"
@@ -24362,21 +24352,12 @@ postcss@^7.0.36:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.1.10, postcss@^8.2.15, postcss@^8.2.4, postcss@^8.2.6, postcss@^8.2.8, postcss@^8.3.5, postcss@^8.3.7, postcss@^8.4.14, postcss@^8.4.21, postcss@^8.4.31, postcss@^8.4.43:
-  version "8.4.47"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"
-  integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==
-  dependencies:
-    nanoid "^3.3.7"
-    picocolors "^1.1.0"
-    source-map-js "^1.2.1"
-
-postcss@^8.2.14:
-  version "8.4.49"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
-  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
+postcss@^8.1.10, postcss@^8.2.14, postcss@^8.2.15, postcss@^8.2.4, postcss@^8.2.6, postcss@^8.2.8, postcss@^8.3.5, postcss@^8.3.7, postcss@^8.4.14, postcss@^8.4.21, postcss@^8.4.31, postcss@^8.4.43:
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.1.tgz#e2272a1f8a807fafa413218245630b5db10a3214"
+  integrity sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==
   dependencies:
-    nanoid "^3.3.7"
+    nanoid "^3.3.8"
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
@@ -24403,16 +24384,16 @@ postgres-interval@^1.1.0:
     xtend "^4.0.0"
 
 prebuild-install@^7.1.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.2.tgz#a5fd9986f5a6251fbc47e1e5c65de71e68c0a056"
-  integrity sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.3.tgz#d630abad2b147443f20a212917beae68b8092eec"
+  integrity sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==
   dependencies:
     detect-libc "^2.0.0"
     expand-template "^2.0.3"
     github-from-package "0.0.0"
     minimist "^1.2.3"
     mkdirp-classic "^0.5.3"
-    napi-build-utils "^1.0.1"
+    napi-build-utils "^2.0.0"
     node-abi "^3.3.0"
     pump "^3.0.0"
     rc "^1.2.7"
@@ -25800,11 +25781,6 @@ regexp.prototype.flags@^1.5.2:
     es-errors "^1.3.0"
     set-function-name "^2.0.1"
 
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-
 regexpp@^3.0.0, regexpp@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
@@ -26003,7 +25979,7 @@ resolve@1.22.0:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.3:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -26112,35 +26088,38 @@ rollup@2.53.1:
     fsevents "~2.3.2"
 
 rollup@^2.45.1:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+  version "2.79.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.2.tgz#f150e4a5db4b121a21a747d762f701e5e9f49090"
+  integrity sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==
   optionalDependencies:
     fsevents "~2.3.2"
 
 rollup@^4.20.0:
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.21.1.tgz#65b9b9e9de9a64604fab083fb127f3e9eac2935d"
-  integrity sha512-ZnYyKvscThhgd3M5+Qt3pmhO4jIRR5RGzaSovB6Q7rGNrK5cUncrtLmcTTJVSdcKXyZjW8X8MB0JMSuH9bcAJg==
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.31.0.tgz#b84af969a0292cb047dce2c0ec5413a9457597a4"
+  integrity sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==
   dependencies:
-    "@types/estree" "1.0.5"
+    "@types/estree" "1.0.6"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.21.1"
-    "@rollup/rollup-android-arm64" "4.21.1"
-    "@rollup/rollup-darwin-arm64" "4.21.1"
-    "@rollup/rollup-darwin-x64" "4.21.1"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.21.1"
-    "@rollup/rollup-linux-arm-musleabihf" "4.21.1"
-    "@rollup/rollup-linux-arm64-gnu" "4.21.1"
-    "@rollup/rollup-linux-arm64-musl" "4.21.1"
-    "@rollup/rollup-linux-powerpc64le-gnu" "4.21.1"
-    "@rollup/rollup-linux-riscv64-gnu" "4.21.1"
-    "@rollup/rollup-linux-s390x-gnu" "4.21.1"
-    "@rollup/rollup-linux-x64-gnu" "4.21.1"
-    "@rollup/rollup-linux-x64-musl" "4.21.1"
-    "@rollup/rollup-win32-arm64-msvc" "4.21.1"
-    "@rollup/rollup-win32-ia32-msvc" "4.21.1"
-    "@rollup/rollup-win32-x64-msvc" "4.21.1"
+    "@rollup/rollup-android-arm-eabi" "4.31.0"
+    "@rollup/rollup-android-arm64" "4.31.0"
+    "@rollup/rollup-darwin-arm64" "4.31.0"
+    "@rollup/rollup-darwin-x64" "4.31.0"
+    "@rollup/rollup-freebsd-arm64" "4.31.0"
+    "@rollup/rollup-freebsd-x64" "4.31.0"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.31.0"
+    "@rollup/rollup-linux-arm-musleabihf" "4.31.0"
+    "@rollup/rollup-linux-arm64-gnu" "4.31.0"
+    "@rollup/rollup-linux-arm64-musl" "4.31.0"
+    "@rollup/rollup-linux-loongarch64-gnu" "4.31.0"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.31.0"
+    "@rollup/rollup-linux-riscv64-gnu" "4.31.0"
+    "@rollup/rollup-linux-s390x-gnu" "4.31.0"
+    "@rollup/rollup-linux-x64-gnu" "4.31.0"
+    "@rollup/rollup-linux-x64-musl" "4.31.0"
+    "@rollup/rollup-win32-arm64-msvc" "4.31.0"
+    "@rollup/rollup-win32-ia32-msvc" "4.31.0"
+    "@rollup/rollup-win32-x64-msvc" "4.31.0"
     fsevents "~2.3.2"
 
 rrweb-cssom@^0.6.0:
@@ -26217,6 +26196,15 @@ safe-regex-test@^1.0.3:
     es-errors "^1.3.0"
     is-regex "^1.1.4"
 
+safe-regex-test@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1"
+  integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==
+  dependencies:
+    call-bound "^1.0.2"
+    es-errors "^1.3.0"
+    is-regex "^1.2.1"
+
 safe-stable-stringify@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz#c8a220ab525cd94e60ebf47ddc404d610dc5d84a"
@@ -26343,6 +26331,16 @@ schema-utils@^4.0.0:
     ajv-formats "^2.1.1"
     ajv-keywords "^5.1.0"
 
+schema-utils@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.0.tgz#3b669f04f71ff2dfb5aba7ce2d5a9d79b35622c0"
+  integrity sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    ajv "^8.9.0"
+    ajv-formats "^2.1.1"
+    ajv-keywords "^5.1.0"
+
 scroll-into-view-if-needed@^2.2.25:
   version "2.2.28"
   resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.28.tgz#5a15b2f58a52642c88c8eca584644e01703d645a"
@@ -26378,83 +26376,40 @@ selfsigned@^2.0.0, selfsigned@^2.1.1:
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+  integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
 
 semver-regex@^3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.3.tgz#b2bcc6f97f63269f286994e297e229b6245d0dc3"
-  integrity sha512-Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ==
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.4.tgz#13053c0d4aa11d070a2f2872b6b1e3ae1e1971b4"
+  integrity sha512-6IiqeZNgq01qGf0TId0t3NvKzSvUsjcpdEO3AQNeIjR6A2+ckTnQlDpl4qu1bjRv0RzN3FP9hzFmws3lKqRWkA==
 
 "semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.3.5, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+semver@7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@^6.3.1:
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.7, semver@^7.6.3:
+semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.3:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
-semver@^7.3.8:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.5.3, semver@^7.5.4:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
-  dependencies:
-    lru-cache "^6.0.0"
-
-send@0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
-  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
-  dependencies:
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    mime "1.6.0"
-    ms "2.1.3"
-    on-finished "2.4.1"
-    range-parser "~1.2.1"
-    statuses "2.0.1"
-
 send@0.19.0:
   version "0.19.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
@@ -26479,17 +26434,10 @@ seq-queue@^0.0.5:
   resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"
   integrity sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4=
 
-serialize-javascript@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
-  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
-  dependencies:
-    randombytes "^2.1.0"
-
-serialize-javascript@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c"
-  integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
+serialize-javascript@^6.0.0, serialize-javascript@^6.0.1, serialize-javascript@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
+  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
   dependencies:
     randombytes "^2.1.0"
 
@@ -26506,7 +26454,7 @@ serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.16.2:
+serve-static@1.16.2, serve-static@^1.13.2:
   version "1.16.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
   integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==
@@ -26516,16 +26464,6 @@ serve-static@1.16.2:
     parseurl "~1.3.3"
     send "0.19.0"
 
-serve-static@^1.13.2:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
-  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.18.0"
-
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -26543,7 +26481,7 @@ set-function-length@^1.2.0:
     gopd "^1.0.1"
     has-property-descriptors "^1.0.1"
 
-set-function-length@^1.2.1:
+set-function-length@^1.2.1, set-function-length@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
   integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
@@ -26862,10 +26800,10 @@ socket.io-adapter@~1.1.0:
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
   integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
 
-socket.io-client@2.4.0, socket.io-client@^2.2.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35"
-  integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==
+socket.io-client@2.5.0, socket.io-client@^2.2.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.5.0.tgz#34f486f3640dde9c2211fce885ac2746f9baf5cb"
+  integrity sha512-lOO9clmdgssDykiOmVQQitwBAF3I6mYcQAo7hQ7AM6Ny5X7fp8hIJ3HcQs3Rjz4SoggoxA1OgrQyY8EgTbcPYw==
   dependencies:
     backo2 "1.0.2"
     component-bind "1.0.0"
@@ -26880,9 +26818,9 @@ socket.io-client@2.4.0, socket.io-client@^2.2.0:
     to-array "0.1.4"
 
 socket.io-parser@~3.3.0:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.3.tgz#3a8b84823eba87f3f7624e64a8aaab6d6318a72f"
-  integrity sha512-qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg==
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.4.tgz#ab84236b6d06eaf1fb68b179b3a7501195886cc3"
+  integrity sha512-z/pFQB3x+EZldRRzORYW1vwVO8m/3ILkswtnpoeU6Ve3cbMWkmHEWDAVJn4QJtchiiFTo5j7UG2QvwxvaA9vow==
   dependencies:
     component-emitter "~1.3.0"
     debug "~3.1.0"
@@ -26898,15 +26836,15 @@ socket.io-parser@~3.4.0:
     isarray "2.0.1"
 
 socket.io@^2.2.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2"
-  integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w==
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.5.1.tgz#224459ecf13ab66bfc7fb6dd0c6bf760a9895e7f"
+  integrity sha512-eaTE4tBKRD6RFoetquMbxgvcpvoDtRyIlkIMI/SMK2bsKvbENTsDeeu4GJ/z9c90yOWxB7b/eC+yKLPbHnH6bA==
   dependencies:
     debug "~4.1.0"
-    engine.io "~3.5.0"
+    engine.io "~3.6.0"
     has-binary2 "~1.0.2"
     socket.io-adapter "~1.1.0"
-    socket.io-client "2.4.0"
+    socket.io-client "2.5.0"
     socket.io-parser "~3.4.0"
 
 sockjs@^0.3.21, sockjs@^0.3.24:
@@ -27030,7 +26968,7 @@ source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, sourc
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@0.7.3, source-map@^0.7.3, source-map@~0.7.2:
+source-map@0.7.3, source-map@^0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -27173,15 +27111,15 @@ ssh-remote-port-forward@^1.0.4:
     ssh2 "^1.4.0"
 
 ssh2@^1.4.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.11.0.tgz#ce60186216971e12f6deb553dcf82322498fe2e4"
-  integrity sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.16.0.tgz#79221d40cbf4d03d07fe881149de0a9de928c9f0"
+  integrity sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==
   dependencies:
-    asn1 "^0.2.4"
+    asn1 "^0.2.6"
     bcrypt-pbkdf "^1.0.2"
   optionalDependencies:
-    cpu-features "~0.0.4"
-    nan "^2.16.0"
+    cpu-features "~0.0.10"
+    nan "^2.20.0"
 
 sshpk@^1.18.0:
   version "1.18.0"
@@ -27826,7 +27764,7 @@ tar-stream@^3.0.0, tar-stream@^3.1.5:
     fast-fifo "^1.2.0"
     streamx "^2.15.0"
 
-tar@6.2.1, tar@^6.2.1:
+tar@6.2.1, tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2, tar@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
   integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
@@ -27838,18 +27776,6 @@ tar@6.2.1, tar@^6.2.1:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
-  version "6.1.11"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
-  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^3.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
 tarn@^3.0.1, tarn@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/tarn/-/tarn-3.0.2.tgz#73b6140fbb881b71559c4f8bfde3d9a4b3d27693"
@@ -27920,7 +27846,7 @@ terminal-link@^2.0.0:
     ansi-escapes "^4.2.1"
     supports-hyperlinks "^2.0.0"
 
-terser-webpack-plugin@^5.1.1, terser-webpack-plugin@^5.3.7:
+terser-webpack-plugin@^5.1.1:
   version "5.3.9"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1"
   integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==
@@ -27942,6 +27868,17 @@ terser-webpack-plugin@^5.1.3:
     source-map "^0.6.1"
     terser "^5.7.2"
 
+terser-webpack-plugin@^5.3.10:
+  version "5.3.11"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz#93c21f44ca86634257cac176f884f942b7ba3832"
+  integrity sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jest-worker "^27.4.5"
+    schema-utils "^4.3.0"
+    serialize-javascript "^6.0.2"
+    terser "^5.31.1"
+
 terser@5.14.2:
   version "5.14.2"
   resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10"
@@ -27952,25 +27889,16 @@ terser@5.14.2:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
-terser@^5.10.0, terser@^5.16.8:
-  version "5.24.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.24.0.tgz#4ae50302977bca4831ccc7b4fef63a3c04228364"
-  integrity sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==
+terser@^5.10.0, terser@^5.16.8, terser@^5.31.1, terser@^5.7.2:
+  version "5.38.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.38.1.tgz#a18d83c8acf3175e847ab0b66839f3c318167c58"
+  integrity sha512-GWANVlPM/ZfYzuPHjq0nxT+EbOEDDN3Jwhwdg1D8TU8oSkktp8w64Uq4auuGLxFSoNTRDncTq2hQHX1Ld9KHkA==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     acorn "^8.8.2"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
-terser@^5.7.2:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc"
-  integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.20"
-
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -28223,11 +28151,6 @@ to-buffer@^1.1.1:
   resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
   integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
 
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -28260,16 +28183,7 @@ totalist@^3.0.0:
   resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
   integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
 
-tough-cookie@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
-  dependencies:
-    psl "^1.1.33"
-    punycode "^2.1.1"
-    universalify "^0.1.2"
-
-tough-cookie@^4.1.3:
+tough-cookie@^4.0.0, tough-cookie@^4.1.3:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
   integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
@@ -28516,15 +28430,10 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-type@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
-  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-
-type@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d"
-  integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==
+type@^2.7.2:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.7.3.tgz#436981652129285cc3ba94f392886c2637ea0486"
+  integrity sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==
 
 typed-array-buffer@^1.0.2:
   version "1.0.2"
@@ -28608,9 +28517,9 @@ typical@^7.1.1, typical@^7.2.0:
   integrity sha512-ya4mg/30vm+DOWfBg4YK3j2WD6TWtRkCbasOJr40CseYENzCUby/7rIvXA99JGsQHeNxLbnXdyLLxKSv3tauFw==
 
 ua-parser-js@^0.7.30:
-  version "0.7.31"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
-  integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==
+  version "0.7.40"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.40.tgz#c87d83b7bb25822ecfa6397a0da5903934ea1562"
+  integrity sha512-us1E3K+3jJppDBa3Tl0L3MOJiGhe1C6P0+nIvQAFYbxlMAx0h81eOwLmU57xgqToduDDPx3y5QsdjPfDu+FgOQ==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
@@ -28661,9 +28570,9 @@ undici-types@~5.26.4:
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
 undici@^5.28.4:
-  version "5.28.4"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.4.tgz#6b280408edb6a1a604a9b20340f45b422e373068"
-  integrity sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==
+  version "5.28.5"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.5.tgz#b2b94b6bf8f1d919bc5a6f31f2c01deb02e54d4b"
+  integrity sha512-zICwjrDrcrUE0pyyJc1I2QzBkLM8FINsgOrt6WjA+BgajVq9Nxu2PbFFXUrAggLfDXlZGZBVZYw7WNV5KiBiBA==
   dependencies:
     "@fastify/busboy" "^2.0.0"
 
@@ -28756,7 +28665,7 @@ universal-user-agent@^6.0.0:
   resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
   integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
 
-universalify@^0.1.0, universalify@^0.1.2:
+universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
@@ -28818,9 +28727,9 @@ uri-js@^4.2.2:
     punycode "^2.1.0"
 
 url-parse@^1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
-  integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
@@ -28882,6 +28791,17 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
+util@^0.12.4:
+  version "0.12.5"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
+  integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==
+  dependencies:
+    inherits "^2.0.3"
+    is-arguments "^1.0.4"
+    is-generator-function "^1.0.7"
+    is-typed-array "^1.1.3"
+    which-typed-array "^1.1.2"
+
 utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
@@ -28892,10 +28812,10 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+uuid@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c"
+  integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==
 
 uuid@8.3.2, uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.2:
   version "8.3.2"
@@ -29047,9 +28967,9 @@ vite-plugin-environment@^1.1.3:
   integrity sha512-9LBhB0lx+2lXVBEWxFZC+WO7PKEyE/ykJ7EPWCq95NEcCpblxamTbs5Dm3DLBGzwODpJMEnzQywJU8fw6XGGGA==
 
 "vite@^3.0.0 || ^4.0.0 || ^5.0.0-0", "vite@^3.1.0 || ^4.0.0 || ^5.0.0-0", vite@^5.4.2:
-  version "5.4.6"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.6.tgz#85a93a1228a7fb5a723ca1743e337a2588ed008f"
-  integrity sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==
+  version "5.4.14"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.14.tgz#ff8255edb02134df180dcfca1916c37a6abe8408"
+  integrity sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==
   dependencies:
     esbuild "^0.21.3"
     postcss "^8.4.43"
@@ -29226,6 +29146,14 @@ watchpack@^2.4.0:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
 
+watchpack@^2.4.1:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da"
+  integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==
+  dependencies:
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.1.2"
+
 wbuf@^1.1.0, wbuf@^1.7.3:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
@@ -29261,9 +29189,9 @@ webidl-conversions@^7.0.0:
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
 webpack-bundle-analyzer@^4.4.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.0.tgz#eecb0ade9bd1944d3d2e38262ec9793da6f13e69"
-  integrity sha512-j+apH0Cs+FY8IOIwxLbkgEJnbQgEPEG8uqLVnRb9tAoGbyKNxQA1u9wNDrTQHK3PinO4Pckew7AE7pnX/RS3wA==
+  version "4.10.2"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz#633af2862c213730be3dbdf40456db171b60d5bd"
+  integrity sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==
   dependencies:
     "@discoveryjs/json-ext" "0.5.7"
     acorn "^8.0.4"
@@ -29273,7 +29201,6 @@ webpack-bundle-analyzer@^4.4.0:
     escape-string-regexp "^4.0.0"
     gzip-size "^6.0.0"
     html-escaper "^2.0.2"
-    is-plain-object "^5.0.0"
     opener "^1.5.2"
     picocolors "^1.0.0"
     sirv "^2.0.3"
@@ -29298,7 +29225,7 @@ webpack-dev-middleware@5.3.0:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-middleware@^5.3.0:
+webpack-dev-middleware@^5.3.0, webpack-dev-middleware@^5.3.4:
   version "5.3.4"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
   integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
@@ -29309,17 +29236,6 @@ webpack-dev-middleware@^5.3.0:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
-  dependencies:
-    colorette "^2.0.10"
-    memfs "^3.4.3"
-    mime-types "^2.1.31"
-    range-parser "^1.2.1"
-    schema-utils "^4.0.0"
-
 webpack-dev-server@4.7.3:
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz#4e995b141ff51fa499906eebc7906f6925d0beaa"
@@ -29356,9 +29272,9 @@ webpack-dev-server@4.7.3:
     ws "^8.1.0"
 
 webpack-dev-server@^4.7.3:
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7"
-  integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==
+  version "4.15.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz#9e0c70a42a012560860adb186986da1248333173"
+  integrity sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
@@ -29388,7 +29304,7 @@ webpack-dev-server@^4.7.3:
     serve-index "^1.9.1"
     sockjs "^0.3.24"
     spdy "^4.0.2"
-    webpack-dev-middleware "^5.3.1"
+    webpack-dev-middleware "^5.3.4"
     ws "^8.13.0"
 
 webpack-merge@5.8.0:
@@ -29456,33 +29372,32 @@ webpack@5.76.1:
     webpack-sources "^3.2.3"
 
 webpack@^5.54.0:
-  version "5.89.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.89.0.tgz#56b8bf9a34356e93a6625770006490bf3a7f32dc"
-  integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==
-  dependencies:
-    "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^1.0.0"
-    "@webassemblyjs/ast" "^1.11.5"
-    "@webassemblyjs/wasm-edit" "^1.11.5"
-    "@webassemblyjs/wasm-parser" "^1.11.5"
-    acorn "^8.7.1"
-    acorn-import-assertions "^1.9.0"
-    browserslist "^4.14.5"
+  version "5.97.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.97.1.tgz#972a8320a438b56ff0f1d94ade9e82eac155fa58"
+  integrity sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==
+  dependencies:
+    "@types/eslint-scope" "^3.7.7"
+    "@types/estree" "^1.0.6"
+    "@webassemblyjs/ast" "^1.14.1"
+    "@webassemblyjs/wasm-edit" "^1.14.1"
+    "@webassemblyjs/wasm-parser" "^1.14.1"
+    acorn "^8.14.0"
+    browserslist "^4.24.0"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.15.0"
+    enhanced-resolve "^5.17.1"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
+    graceful-fs "^4.2.11"
     json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
     schema-utils "^3.2.0"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.3.7"
-    watchpack "^2.4.0"
+    terser-webpack-plugin "^5.3.10"
+    watchpack "^2.4.1"
     webpack-sources "^3.2.3"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
@@ -29591,6 +29506,18 @@ which-typed-array@^1.1.15:
     gopd "^1.0.1"
     has-tostringtag "^1.0.2"
 
+which-typed-array@^1.1.16, which-typed-array@^1.1.2:
+  version "1.1.18"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.18.tgz#df2389ebf3fbb246a71390e90730a9edb6ce17ad"
+  integrity sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    for-each "^0.3.3"
+    gopd "^1.2.0"
+    has-tostringtag "^1.0.2"
+
 which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -29713,6 +29640,11 @@ wordwrapjs@^5.1.0:
   resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-5.1.0.tgz#4c4d20446dcc670b14fa115ef4f8fd9947af2b3a"
   integrity sha512-JNjcULU2e4KJwUNv6CHgI46UvDGitb6dGryHajXTDiLgg1/RiGoPSDw4kZfYnwGtEXf2ZMeIewDQgFGzkCB2Sg==
 
+workerpool@^9.2.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-9.2.0.tgz#f74427cbb61234708332ed8ab9cbf56dcb1c4371"
+  integrity sha512-PKZqBOCo6CYkVOwAxWxQaSF2Fvb5Iv2fCeTP7buyWI2GiynWr46NcXSgK/idoV6e60dgCBfgYc+Un3HMvmqP8w==
+
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -29829,7 +29761,7 @@ ws@^5.2.3:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.1.2, ws@^7.3.1, ws@^7.4.3, ws@^7.4.6, ws@^7.5.3:
+ws@^7.1.2, ws@^7.3.1, ws@^7.4.3, ws@^7.4.6, ws@^7.5.3, ws@~7.5.10:
   version "7.5.10"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
   integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
@@ -29839,11 +29771,6 @@ ws@^8.1.0, ws@^8.13.0, ws@^8.16.0:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
   integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
 
-ws@~7.4.2:
-  version "7.4.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
-  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
-
 xhr@^2.0.1:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.6.0.tgz#b69d4395e792b4173d6b7df077f0fc5e4e2b249d"
@@ -29869,13 +29796,13 @@ xml-parse-from-string@^1.0.0:
   resolved "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz#a9029e929d3dbcded169f3c6e28238d95a5d5a28"
   integrity sha1-qQKekp09vN7RafPG4oI42VpdWig=
 
-xml2js@0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
-  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
+xml2js@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.2.tgz#dd0b630083aa09c161e25a4d0901e2b2a929b499"
+  integrity sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==
   dependencies:
     sax ">=0.6.0"
-    xmlbuilder "~9.0.1"
+    xmlbuilder "~11.0.0"
 
 xml2js@^0.4.4, xml2js@^0.4.5:
   version "0.4.23"
@@ -29904,10 +29831,10 @@ xmlbuilder2@^2.4.0:
     "@types/node" "*"
     js-yaml "3.14.0"
 
-xmlbuilder@^9.0.7, xmlbuilder@~9.0.1:
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
+xmlbuilder@^15.1.1:
+  version "15.1.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"
+  integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==
 
 xmlbuilder@~11.0.0:
   version "11.0.1"