diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc0715ca72..f38c4cfff6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 
diff --git a/lerna.json b/lerna.json
index e80586b5c8..58a844a060 100644
--- a/lerna.json
+++ b/lerna.json
@@ -4,7 +4,7 @@
     "testapps/*",
     "packages/ngx/projects/ngx-tolgee"
   ],
-  "version": "3.6.0",
+  "version": "4.0.0",
   "command": {
     "publish": {
       "conventionalCommits": true
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
index 9670a81642..2b2f7fd759 100644
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 
diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json
index ef8177590d..252295827e 100644
--- a/packages/core/package-lock.json
+++ b/packages/core/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/core",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/packages/core/package.json b/packages/core/package.json
index b86b07c3e8..1752d55ed1 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/core",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "description": "Library providing ability to translate messages directly in context of developed application.",
   "main": "index.js",
   "module": "./dist/tolgee.esm.js",
diff --git a/packages/i18next/CHANGELOG.md b/packages/i18next/CHANGELOG.md
index 1af939ed10..dff3c5c488 100644
--- a/packages/i18next/CHANGELOG.md
+++ b/packages/i18next/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/i18next
diff --git a/packages/i18next/package-lock.json b/packages/i18next/package-lock.json
index 9ea022a818..92e9cf45b5 100644
--- a/packages/i18next/package-lock.json
+++ b/packages/i18next/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/i18next",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/packages/i18next/package.json b/packages/i18next/package.json
index 169a98e9ad..875ba0040f 100644
--- a/packages/i18next/package.json
+++ b/packages/i18next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/i18next",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "description": "Tolgee i18n integration.",
   "main": "index.js",
   "module": "./dist/tolgee-i18next.esm.js",
@@ -66,6 +66,6 @@
     "i18next": "^21.5.4"
   },
   "dependencies": {
-    "@tolgee/core": "^3.6.0"
+    "@tolgee/core": "^4.0.0"
   }
 }
diff --git a/packages/ngx/CHANGELOG.md b/packages/ngx/CHANGELOG.md
index 235963a4c0..c5162e2fe7 100644
--- a/packages/ngx/CHANGELOG.md
+++ b/packages/ngx/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/ngx-workspace
diff --git a/packages/ngx/package-lock.json b/packages/ngx/package-lock.json
index 66538e1c00..3a6d716db8 100644
--- a/packages/ngx/package-lock.json
+++ b/packages/ngx/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/ngx-workspace",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/packages/ngx/package.json b/packages/ngx/package.json
index 4d66fc862c..8d720f8394 100644
--- a/packages/ngx/package.json
+++ b/packages/ngx/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tolgee/ngx-workspace",
   "private": true,
-  "version": "3.6.0",
+  "version": "4.0.0",
   "keywords": [
     "localization",
     "internationalization",
@@ -27,7 +27,7 @@
     "@angular/platform-browser": "~13.1.3",
     "@angular/platform-browser-dynamic": "~13.2.5",
     "@angular/router": "~13.1.3",
-    "@tolgee/core": "^3.6.0",
+    "@tolgee/core": "^4.0.0",
     "rxjs": "~7.5.5",
     "tslib": "^2.0.0",
     "zone.js": "~0.11.5"
diff --git a/packages/ngx/projects/ngx-tolgee/CHANGELOG.md b/packages/ngx/projects/ngx-tolgee/CHANGELOG.md
index 017c9eda13..6b3a83d4a5 100644
--- a/packages/ngx/projects/ngx-tolgee/CHANGELOG.md
+++ b/packages/ngx/projects/ngx-tolgee/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/ngx
diff --git a/packages/ngx/projects/ngx-tolgee/package-lock.json b/packages/ngx/projects/ngx-tolgee/package-lock.json
index 366e03952d..51189f4f29 100755
--- a/packages/ngx/projects/ngx-tolgee/package-lock.json
+++ b/packages/ngx/projects/ngx-tolgee/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/ngx",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/packages/ngx/projects/ngx-tolgee/package.json b/packages/ngx/projects/ngx-tolgee/package.json
index fb134e325a..163c332807 100755
--- a/packages/ngx/projects/ngx-tolgee/package.json
+++ b/packages/ngx/projects/ngx-tolgee/package.json
@@ -6,9 +6,9 @@
     "url": "https://github.com/tolgee/tolgee-js"
   },
   "dependencies": {
-    "@tolgee/core": "^3.6.0"
+    "@tolgee/core": "^4.0.0"
   },
-  "version": "3.6.0",
+  "version": "4.0.0",
   "publishConfig": {
     "directory": "../../dist/ngx-tolgee",
     "access": "public"
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
index 831658f134..c636879dc2 100644
--- a/packages/react/CHANGELOG.md
+++ b/packages/react/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/react
diff --git a/packages/react/package-lock.json b/packages/react/package-lock.json
index 60b1ca481d..9c4cb8ee60 100644
--- a/packages/react/package-lock.json
+++ b/packages/react/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/react",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/packages/react/package.json b/packages/react/package.json
index d7446e3e14..4c4c81f2cf 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/react",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "description": "React implementation for tolgee localization framework",
   "main": "index.js",
   "types": "lib/index.d.ts",
@@ -36,14 +36,14 @@
     "react": "^16.14.0 || ^17.0.1"
   },
   "dependencies": {
-    "@tolgee/core": "^3.6.0"
+    "@tolgee/core": "^4.0.0"
   },
   "devDependencies": {
     "@rollup/plugin-typescript": "8.3.1",
     "@testing-library/dom": "^8.7.2",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^12.1.2",
-    "@tolgee/ui": "^3.6.0",
+    "@tolgee/ui": "^4.0.0",
     "@types/jest": "^27.0.2",
     "@types/node": "^17.0.8",
     "@types/react": "^17.0.1",
diff --git a/packages/socketio-client/CHANGELOG.md b/packages/socketio-client/CHANGELOG.md
index a6825f2288..dd15d005da 100644
--- a/packages/socketio-client/CHANGELOG.md
+++ b/packages/socketio-client/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+**Note:** Version bump only for package @tolgee/socketio-client
+
+
+
+
+
 # [3.0.0](https://github.com/tolgee/tolgee-js/compare/v2.8.2...v3.0.0) (2021-12-17)
 
 **Note:** Version bump only for package @tolgee/socketio-client
diff --git a/packages/socketio-client/package-lock.json b/packages/socketio-client/package-lock.json
index 8024d95d2f..66a85ddc45 100644
--- a/packages/socketio-client/package-lock.json
+++ b/packages/socketio-client/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/socketio-client",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/packages/socketio-client/package.json b/packages/socketio-client/package.json
index 3c5d85410d..74b57a0b3f 100644
--- a/packages/socketio-client/package.json
+++ b/packages/socketio-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/socketio-client",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "Client library for Tolgee Socket.io server",
   "main": "dist/tolgee-socketio-client.umd.js",
   "types": "./lib/index.d.ts",
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index df091670b9..2f57ffab6b 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/svelte
diff --git a/packages/svelte/package-lock.json b/packages/svelte/package-lock.json
index 7cdcd2eedb..feb48b1f11 100644
--- a/packages/svelte/package-lock.json
+++ b/packages/svelte/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/svelte",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index eb9cbd8e36..6f3d66d94e 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/svelte",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "scripts": {
     "build": "svelte-kit package",
     "clean": "rm -rf build build-e2e dist dist-e2e lib .svelte-kit",
@@ -19,7 +19,7 @@
     "@sveltejs/kit": "next",
     "@testing-library/jest-dom": "5.16.2",
     "@testing-library/svelte": "3.0.3",
-    "@tolgee/core": "^3.6.0",
+    "@tolgee/core": "^4.0.0",
     "@types/jest": "27.4.1",
     "@typescript-eslint/eslint-plugin": "^5.12.1",
     "@typescript-eslint/parser": "^5.14.0",
diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md
index 548f85ffc0..e8711f5302 100644
--- a/packages/ui/CHANGELOG.md
+++ b/packages/ui/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+**Note:** Version bump only for package @tolgee/ui
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/ui
diff --git a/packages/ui/package-lock.json b/packages/ui/package-lock.json
index 84ef81d0b6..7ba8a955c8 100644
--- a/packages/ui/package-lock.json
+++ b/packages/ui/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/ui",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 994f8b7759..e94853243a 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/ui",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "description": "Translation mode UI for @tolgee/core package",
   "main": "index.js",
   "module": "./dist/tolgee-ui.esm.js",
@@ -25,7 +25,7 @@
     "index.js"
   ],
   "dependencies": {
-    "@tolgee/core": "^3.6.0"
+    "@tolgee/core": "^4.0.0"
   },
   "devDependencies": {
     "@emotion/react": "^11.4.1",
diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md
index 4d427184e5..3d6128560d 100644
--- a/packages/vue/CHANGELOG.md
+++ b/packages/vue/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/vue
diff --git a/packages/vue/package-lock.json b/packages/vue/package-lock.json
index 268fff4f90..091338cb73 100644
--- a/packages/vue/package-lock.json
+++ b/packages/vue/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/vue",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/packages/vue/package.json b/packages/vue/package.json
index e5dc8a5e8d..3f33a10e45 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/vue",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "description": "Vue implementation for tolgee localization framework",
   "module": "dist/tolgee-vue.esm.js",
   "main": "dist/tolgee-vue.cjs.js",
@@ -37,13 +37,13 @@
     "vue": "^3.0.0"
   },
   "dependencies": {
-    "@tolgee/core": "^3.6.0"
+    "@tolgee/core": "^4.0.0"
   },
   "devDependencies": {
     "@rollup/plugin-typescript": "8.3.1",
     "@testing-library/jest-dom": "^5.16.2",
     "@testing-library/vue": "^6.5.1",
-    "@tolgee/ui": "^3.6.0",
+    "@tolgee/ui": "^4.0.0",
     "@types/jest": "^27.0.2",
     "@vue/vue3-jest": "^27.0.0-alpha.3",
     "concurrently": "7.0.0",
diff --git a/testapps/core/CHANGELOG.md b/testapps/core/CHANGELOG.md
index 8439be2c54..85aa17acda 100644
--- a/testapps/core/CHANGELOG.md
+++ b/testapps/core/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+**Note:** Version bump only for package @tolgee/core-testapp
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/core-testapp
diff --git a/testapps/core/package-lock.json b/testapps/core/package-lock.json
index 38a128e8f2..d897071aa3 100644
--- a/testapps/core/package-lock.json
+++ b/testapps/core/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/core-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/testapps/core/package.json b/testapps/core/package.json
index 075bf1e33d..a42953fbed 100644
--- a/testapps/core/package.json
+++ b/testapps/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/core-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "description": "Test applications for Tolgee JS core.",
   "main": "index.js",
   "private": true,
@@ -13,8 +13,8 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@tolgee/core": "^3.6.0",
-    "@tolgee/ui": "^3.6.0",
+    "@tolgee/core": "^4.0.0",
+    "@tolgee/ui": "^4.0.0",
     "copy-webpack-plugin": "^10.2.4",
     "html-webpack-plugin": "^5.5.0",
     "serve": "^13.0.2",
diff --git a/testapps/gatsby/CHANGELOG.md b/testapps/gatsby/CHANGELOG.md
index b3f7a9503d..d9425d8d81 100644
--- a/testapps/gatsby/CHANGELOG.md
+++ b/testapps/gatsby/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/gatsby-testapp
diff --git a/testapps/gatsby/package-lock.json b/testapps/gatsby/package-lock.json
index 812725366a..1de87a96a4 100644
--- a/testapps/gatsby/package-lock.json
+++ b/testapps/gatsby/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/gatsby-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/testapps/gatsby/package.json b/testapps/gatsby/package.json
index 195ba269c7..f176ae5a51 100644
--- a/testapps/gatsby/package.json
+++ b/testapps/gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/gatsby-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "private": true,
   "description": "Tolgee Gatsby TestApp",
   "author": "Jan Cizmar",
@@ -15,9 +15,9 @@
     "clean": "gatsby clean"
   },
   "dependencies": {
-    "@tolgee/core": "^3.6.0",
-    "@tolgee/react": "^3.6.0",
-    "@tolgee/ui": "^3.6.0",
+    "@tolgee/core": "^4.0.0",
+    "@tolgee/react": "^4.0.0",
+    "@tolgee/ui": "^4.0.0",
     "gatsby": "^3.13.0",
     "gatsby-plugin-react-intl": "^3.0.2",
     "react": "^17.0.1",
diff --git a/testapps/next-internal/CHANGELOG.md b/testapps/next-internal/CHANGELOG.md
index ecc6b31022..123ffa7b5e 100644
--- a/testapps/next-internal/CHANGELOG.md
+++ b/testapps/next-internal/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/next-internal-testapp
diff --git a/testapps/next-internal/package-lock.json b/testapps/next-internal/package-lock.json
index 700bbb128f..0a11d73718 100644
--- a/testapps/next-internal/package-lock.json
+++ b/testapps/next-internal/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/next-internal-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/testapps/next-internal/package.json b/testapps/next-internal/package.json
index 95eb20f7e1..107665b2b1 100644
--- a/testapps/next-internal/package.json
+++ b/testapps/next-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/next-internal-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -11,8 +11,8 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@tolgee/react": "^3.6.0",
-    "@tolgee/ui": "^3.6.0",
+    "@tolgee/react": "^4.0.0",
+    "@tolgee/ui": "^4.0.0",
     "next": "11.1.2",
     "react": "17.0.2",
     "react-dom": "17.0.2"
diff --git a/testapps/next/CHANGELOG.md b/testapps/next/CHANGELOG.md
index d1b74270e5..9ab19733f1 100644
--- a/testapps/next/CHANGELOG.md
+++ b/testapps/next/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/next-testapp
diff --git a/testapps/next/package-lock.json b/testapps/next/package-lock.json
index 7cd07bb562..8c23d97797 100644
--- a/testapps/next/package-lock.json
+++ b/testapps/next/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/next-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/testapps/next/package.json b/testapps/next/package.json
index ba9d7cdabd..975477d2cc 100644
--- a/testapps/next/package.json
+++ b/testapps/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/next-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -12,8 +12,8 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@tolgee/react": "^3.6.0",
-    "@tolgee/ui": "^3.6.0",
+    "@tolgee/react": "^4.0.0",
+    "@tolgee/ui": "^4.0.0",
     "next": "12.0.3",
     "react": "17.0.2",
     "react-dom": "17.0.2"
diff --git a/testapps/ngx/CHANGELOG.md b/testapps/ngx/CHANGELOG.md
index c524d330aa..8e20e04fd7 100644
--- a/testapps/ngx/CHANGELOG.md
+++ b/testapps/ngx/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+**Note:** Version bump only for package @tolgee/ngx-testapp
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/ngx-testapp
diff --git a/testapps/ngx/package-lock.json b/testapps/ngx/package-lock.json
index 2aea5801b9..a3f60ea692 100644
--- a/testapps/ngx/package-lock.json
+++ b/testapps/ngx/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/ngx-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/testapps/ngx/package.json b/testapps/ngx/package.json
index b97902c22c..4e459976d7 100644
--- a/testapps/ngx/package.json
+++ b/testapps/ngx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/ngx-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "scripts": {
     "ng": "ng",
     "develop": "ng serve --configuration=stage",
@@ -21,9 +21,9 @@
     "@angular/platform-browser": "~13.1.3",
     "@angular/platform-browser-dynamic": "~13.1.3",
     "@angular/router": "~13.1.3",
-    "@tolgee/core": "^3.6.0",
-    "@tolgee/ngx": "^3.6.0",
-    "@tolgee/ui": "^3.6.0",
+    "@tolgee/core": "^4.0.0",
+    "@tolgee/ngx": "^4.0.0",
+    "@tolgee/ui": "^4.0.0",
     "@types/react": "^17.0.39",
     "rxjs": "~7.5.5",
     "serve": "^13.0.2",
diff --git a/testapps/react-i18next/CHANGELOG.md b/testapps/react-i18next/CHANGELOG.md
index 66bf553ab1..7312bab132 100644
--- a/testapps/react-i18next/CHANGELOG.md
+++ b/testapps/react-i18next/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/react-i18next-testapp
diff --git a/testapps/react-i18next/package-lock.json b/testapps/react-i18next/package-lock.json
index f244e35c86..d31a490998 100644
--- a/testapps/react-i18next/package-lock.json
+++ b/testapps/react-i18next/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/react-i18next-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/testapps/react-i18next/package.json b/testapps/react-i18next/package.json
index 8d76a2d53f..f8e0417c2e 100644
--- a/testapps/react-i18next/package.json
+++ b/testapps/react-i18next/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@tolgee/react-i18next-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "private": true,
   "dependencies": {
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
-    "@tolgee/core": "^3.6.0",
-    "@tolgee/i18next": "^3.6.0",
-    "@tolgee/ui": "^3.6.0",
+    "@tolgee/core": "^4.0.0",
+    "@tolgee/i18next": "^4.0.0",
+    "@tolgee/ui": "^4.0.0",
     "concurrently": "^6.4.0",
     "i18next": "^21.5.4",
     "i18next-icu": "^2.0.3",
diff --git a/testapps/react/CHANGELOG.md b/testapps/react/CHANGELOG.md
index df1ea62c5b..4e25a8d34d 100644
--- a/testapps/react/CHANGELOG.md
+++ b/testapps/react/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/react-testapp
diff --git a/testapps/react/package-lock.json b/testapps/react/package-lock.json
index 8f09742cbd..7e737f571f 100644
--- a/testapps/react/package-lock.json
+++ b/testapps/react/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/react-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/testapps/react/package.json b/testapps/react/package.json
index 55e4d86c85..2cc735f083 100644
--- a/testapps/react/package.json
+++ b/testapps/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/react-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "private": true,
   "dependencies": {
     "@emotion/react": "^11.8.1",
@@ -9,8 +9,8 @@
     "@testing-library/jest-dom": "^5.16.2",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^13.3.0",
-    "@tolgee/react": "^3.6.0",
-    "@tolgee/ui": "^3.6.0",
+    "@tolgee/react": "^4.0.0",
+    "@tolgee/ui": "^4.0.0",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.21",
     "@types/react": "17.0.39",
diff --git a/testapps/svelte/CHANGELOG.md b/testapps/svelte/CHANGELOG.md
index 3fbbdaa044..4320c4343d 100644
--- a/testapps/svelte/CHANGELOG.md
+++ b/testapps/svelte/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/svelte-testapp
diff --git a/testapps/svelte/package-lock.json b/testapps/svelte/package-lock.json
index 2d4c933ac4..c0424b1d9e 100644
--- a/testapps/svelte/package-lock.json
+++ b/testapps/svelte/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/svelte-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/testapps/svelte/package.json b/testapps/svelte/package.json
index b174240d5a..11e4404f6d 100644
--- a/testapps/svelte/package.json
+++ b/testapps/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/svelte-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "private": true,
   "scripts": {
     "dev": "svelte-kit dev",
@@ -19,9 +19,9 @@
   "devDependencies": {
     "@sveltejs/adapter-static": "1.0.0-next.23",
     "@sveltejs/kit": "1.0.0-next.206",
-    "@tolgee/core": "^3.6.0",
-    "@tolgee/svelte": "^3.6.0",
-    "@tolgee/ui": "^3.6.0",
+    "@tolgee/core": "^4.0.0",
+    "@tolgee/svelte": "^4.0.0",
+    "@tolgee/ui": "^4.0.0",
     "@typescript-eslint/eslint-plugin": "^5.12.1",
     "@typescript-eslint/parser": "^5.12.1",
     "eslint": "^8.10.0",
diff --git a/testapps/vue-i18next/CHANGELOG.md b/testapps/vue-i18next/CHANGELOG.md
index 8e311538b7..74175da07d 100644
--- a/testapps/vue-i18next/CHANGELOG.md
+++ b/testapps/vue-i18next/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/vue-i18next-testapp
diff --git a/testapps/vue-i18next/package-lock.json b/testapps/vue-i18next/package-lock.json
index ee818625d0..529792a687 100644
--- a/testapps/vue-i18next/package-lock.json
+++ b/testapps/vue-i18next/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/vue-i18next-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/testapps/vue-i18next/package.json b/testapps/vue-i18next/package.json
index bedaed4628..bd86229faa 100644
--- a/testapps/vue-i18next/package.json
+++ b/testapps/vue-i18next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/vue-i18next-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "private": true,
   "scripts": {
     "start": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
@@ -14,9 +14,9 @@
   },
   "dependencies": {
     "@panter/vue-i18next": "^0.15.2",
-    "@tolgee/core": "^3.6.0",
-    "@tolgee/i18next": "^3.6.0",
-    "@tolgee/ui": "^3.6.0",
+    "@tolgee/core": "^4.0.0",
+    "@tolgee/i18next": "^4.0.0",
+    "@tolgee/ui": "^4.0.0",
     "core-js": "^3.6.5",
     "i18next": "^21.6.3",
     "i18next-icu": "^2.0.3",
diff --git a/testapps/vue/CHANGELOG.md b/testapps/vue/CHANGELOG.md
index 6e2accb6df..270746937f 100644
--- a/testapps/vue/CHANGELOG.md
+++ b/testapps/vue/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/tolgee/tolgee-js/compare/v3.6.0...v4.0.0) (2022-03-10)
+
+
+### Features
+
+* Use invisible wrapping instead of span component ([3848cda](https://github.com/tolgee/tolgee-js/commit/3848cdaf70fe9c76fd56c88d3c7399b87ff0f88b))
+
+
+### BREAKING CHANGES
+
+* default invisible mode, defaultValue
+
+
+
+
+
 # [3.6.0](https://github.com/tolgee/tolgee-js/compare/v3.5.0...v3.6.0) (2022-02-28)
 
 **Note:** Version bump only for package @tolgee/vue-testapp
diff --git a/testapps/vue/package-lock.json b/testapps/vue/package-lock.json
index 519eaad903..5d050e1867 100644
--- a/testapps/vue/package-lock.json
+++ b/testapps/vue/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/vue-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/testapps/vue/package.json b/testapps/vue/package.json
index 6f5ffecc14..5d65da2694 100644
--- a/testapps/vue/package.json
+++ b/testapps/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/vue-testapp",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "private": true,
   "scripts": {
     "start": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
@@ -13,9 +13,9 @@
     "serve:dev": "serve -p 3002 -s dist-e2e"
   },
   "dependencies": {
-    "@tolgee/core": "^3.6.0",
-    "@tolgee/ui": "^3.6.0",
-    "@tolgee/vue": "^3.6.0",
+    "@tolgee/core": "^4.0.0",
+    "@tolgee/ui": "^4.0.0",
+    "@tolgee/vue": "^4.0.0",
     "core-js": "^3.21.1",
     "vue": "^3.0.0"
   },